summaryrefslogtreecommitdiffstats
path: root/urpme
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2006-11-24 19:09:58 +0000
committerPascal Rigaux <pixel@mandriva.com>2006-11-24 19:09:58 +0000
commit298bb002ec4f7b0e9fd1e949a984800295deba4c (patch)
treec3c6ea375afd132fa7ee0d218dda8df35f96d219 /urpme
parentfd0896023c12ea77e9c355bc11b8d78cd2bff5f4 (diff)
downloadurpmi-298bb002ec4f7b0e9fd1e949a984800295deba4c.tar
urpmi-298bb002ec4f7b0e9fd1e949a984800295deba4c.tar.gz
urpmi-298bb002ec4f7b0e9fd1e949a984800295deba4c.tar.bz2
urpmi-298bb002ec4f7b0e9fd1e949a984800295deba4c.tar.xz
urpmi-298bb002ec4f7b0e9fd1e949a984800295deba4c.zip
use $options{usedistrib} for all progs (prepare for next commit)
Diffstat (limited to 'urpme')
-rw-r--r--urpme6
1 files changed, 3 insertions, 3 deletions
diff --git a/urpme b/urpme
index bcedafdf..613fd3fb 100644
--- a/urpme
+++ b/urpme
@@ -31,7 +31,7 @@ use urpm::select;
$ENV{PATH} = "/sbin:/usr/sbin:/bin:/usr/bin:/usr/X11R6/bin";
delete @ENV{qw(ENV BASH_ENV IFS CDPATH)};
-our ($root, $test, $parallel, $auto, $matches, $verbose, $usedistrib, $force, $noscripts, $repackage, @l, $bundle, $restricted);
+our ($root, $test, $parallel, $auto, $matches, $verbose, $force, $noscripts, $repackage, @l, $bundle, $restricted);
# Translator: Add here the keys which might be pressed in the "Yes"-case.
my $yesexpr = N("Yy");
@@ -76,7 +76,7 @@ if ($< && !$test) {
#- rurpme checks
if ($restricted) {
- urpm::error_restricted($urpm) if $root || $usedistrib || $noscripts || $parallel;
+ urpm::error_restricted($urpm) if $root || $options{usedistrib} || $noscripts || $parallel;
}
unless ($test) {
@@ -90,7 +90,7 @@ urpm::media::configure($urpm,
root => $root,
parallel => $parallel,
probe_with => $options{probe_with},
- usedistrib => $usedistrib,
+ usedistrib => $options{usedistrib},
);
#- examine packages...