4.0-22mdk

1 files changed, 26 insertions, 14 deletions

diff --git a/urpmq b/urpmq
index e8438013..47e8d9a5 100755
--- a/urpmq
+++ b/urpmq
@@ -37,18 +37,8 @@ Copyright (C) 2000, 2001, 2002 MandrakeSoft.
 This is free software and may be redistributed under the terms of the GNU GPL.
 
 usage:
-") . _("  -h             - print this help message.
-") . _("  -v             - verbose mode.
-") . _("  -d             - extend query to package dependencies.
-") . _("  -u             - remove package if a more recent version is already installed.
-") . _("  -c             - choose complete method for resolving requires closure.
-") . _("  -P             - do not search in provides to find package.
-") . _("  -y             - impose fuzzy search (same as --fuzzy).
-") . _("  -s             - next package is a source package (same as --src).
-") . _("  -g             - print groups with name also.
-") . _("  -r             - print version and release with name also.
-") . _("  -f             - print version, release and arch with name.
-") . "\n" . _("  --update       - use only update media.
+", $urpm::VERSION) . _("  --help         - print this help message.
+") . _("  --update       - use only update media.
 ") . _("  --media        - use only the media listed by comma.
 ") . _("  --synthesis    - use the synthesis given instead of urpmi db.
 ") . _("  --auto-select  - automatically select packages to upgrade the system.
@@ -56,6 +46,7 @@ usage:
 ") . _("  --list         - list available packages.
 ") . _("  --list-media   - list available media.
 ") . _("  --list-nodes   - list available nodes when using --parallel.
+") . _("  --list-aliases - list available parallel aliases.
 ") . _("  --src          - next package is a source package (same as -s).
 ") . _("  --headers      - extract headers for package listed from urpmi db to
                    stdout (root only).
@@ -68,8 +59,18 @@ usage:
                    to be 1080 by default (format is <proxyhost[:port]>).
 ") . _("  --proxy-user   - specify user and password to use for proxy
                    authentication (format is <user:password>).
+") . _("  -v             - verbose mode.
+") . _("  -d             - extend query to package dependencies.
+") . _("  -u             - remove package if a more recent version is already installed.
+") . _("  -c             - choose complete method for resolving requires closure.
+") . _("  -P             - do not search in provides to find package.
+") . _("  -y             - impose fuzzy search (same as --fuzzy).
+") . _("  -s             - next package is a source package (same as --src).
+") . _("  -g             - print groups with name also.
+") . _("  -r             - print version and release with name also.
+") . _("  -f             - print version, release and arch with name.
 ") . "\n" . _("  names or rpm files given on command line are queried.
-", $urpm::VERSION);
+");
     exit(0);
 }
 
@@ -89,6 +90,7 @@ for (@ARGV) {
     /^--list$/ and do { $query->{list} = 1; next };
     /^--list-media$/ and do { $query->{list_media} = 1; next };
     /^--list-nodes$/ and do { $query->{list_nodes} = 1; next };
+    /^--list-aliases$/ and do { $query->{list_aliases} = 1; next };
     /^--src$/ and do { $query->{src} = 1; next };
     /^--headers$/ and do { $query->{headers} = 1; next };
     /^--sources$/ and do { $query->{sources} = 1; next };
@@ -156,7 +158,17 @@ $urpm->configure(nocheck_access => 1,
 my $state = {};
 my %requested;
 
-if ($query->{list_nodes}) {
+if ($query->{list_aliases}) {
+    local ($_, *PARALLEL);
+    open PARALLEL, "/etc/urpmi/parallel.cfg";
+    while (<PARALLEL>) {
+	chomp; s/#.*$//; s/^\s*//; s/\s*$//;
+	/\s*([^:]*):/ or next;
+	print "$1\n";
+    }
+    close PARALLEL;
+} elsif ($query->{list_nodes}) {
+    $query->{parallel} or $urpm->{fatal}(1, _("--list-nodes can only be used with --parallel"));
     foreach (keys %{$urpm->{parallel_handler}{nodes} || {}}) {
 	print "$_\n";
     }