summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2006-11-24 19:08:01 +0000
committerPascal Rigaux <pixel@mandriva.com>2006-11-24 19:08:01 +0000
commitfd0896023c12ea77e9c355bc11b8d78cd2bff5f4 (patch)
tree241fac5e13b4768d4a06e1126d182e67cbb1aa94
parent4f3d92adb97d089521b4e62346d9034bf292f2bd (diff)
downloadurpmi-fd0896023c12ea77e9c355bc11b8d78cd2bff5f4.tar
urpmi-fd0896023c12ea77e9c355bc11b8d78cd2bff5f4.tar.gz
urpmi-fd0896023c12ea77e9c355bc11b8d78cd2bff5f4.tar.bz2
urpmi-fd0896023c12ea77e9c355bc11b8d78cd2bff5f4.tar.xz
urpmi-fd0896023c12ea77e9c355bc11b8d78cd2bff5f4.zip
simplify (%urpm::args::options is exported)
-rw-r--r--urpme3
-rwxr-xr-xurpmi9
2 files changed, 9 insertions, 3 deletions
diff --git a/urpme b/urpme
index cc8c1f3f..bcedafdf 100644
--- a/urpme
+++ b/urpme
@@ -51,6 +51,8 @@ usage:
") . N(" --noscripts - do not execute package scriptlet(s).
") . N(" --use-distrib - configure urpme on the fly from a distrib tree, useful
to (un)install a chroot with --root option.
+") . N(" --probe-synthesis - use synthesis file.
+") . N(" --probe-hdlist - use hdlist file.
") . N(" -v - verbose mode.
") . N(" -a - select all packages matching expression.
");
@@ -87,6 +89,7 @@ urpm::media::configure($urpm,
synthesis => ($parallel ? 'none' : ''),
root => $root,
parallel => $parallel,
+ probe_with => $options{probe_with},
usedistrib => $usedistrib,
);
diff --git a/urpmi b/urpmi
index b9c0b145..0a6fe712 100755
--- a/urpmi
+++ b/urpmi
@@ -114,6 +114,8 @@ usage:
") . N(" --root - use another root for rpm installation.
") . N(" --use-distrib - configure urpmi on the fly from a distrib tree, useful
to install a chroot with --root option.
+") . N(" --probe-synthesis - use synthesis file.
+") . N(" --probe-hdlist - use hdlist file.
") . N(" --wget - use wget to retrieve distant files.
") . N(" --curl - use curl to retrieve distant files.
") . N(" --prozilla - use prozilla to retrieve distant files.
@@ -187,7 +189,7 @@ if (@ARGV && $auto_select) {
# Verify that arguments were given
unless (@ARGV || $auto_select) {
- if ($urpm::args::options{bug}) {
+ if ($options{bug}) {
print STDERR N("Error: To generate a bug report, specify the usual command-line arguments
along with --bug.\n");
exit 1;
@@ -235,7 +237,7 @@ if ($restricted) {
}
#- prepare bug report.
-my $bug = $urpm::args::options{bug};
+my $bug = $options{bug};
if ($bug) {
mkdir $bug or $urpm->{fatal}(8, (-d $bug
? N("Directory [%s] already exists, please use another directory for bug report or delete it", $bug)
@@ -346,11 +348,12 @@ my %config_hash = (
parallel => $parallel,
root => $root,
searchmedia => $searchmedia,
- cmdline_skiplist => $urpm::args::options{skip},
+ cmdline_skiplist => $options{skip},
sortmedia => $sortmedia,
synthesis => $synthesis,
update => $update,
usedistrib => $usedistrib,
+ probe_with => $options{probe_with},
);
$root and $urpm->{options}{'priority-upgrade'} = '';