[devscripts] 03/06: rmadison: Make --help handle comma-separated $default_url

[James McCoy]

This is an automated email from the git hooks/post-receive script.

jamessan pushed a commit to branch master
in repository devscripts.

commit 0b305661188167d5c19c47c5c7b53b4405bc33c8
Author: James McCoy <jamessan at debian.org>
Date:   Mon Jan 12 22:44:22 2015 -0500

    rmadison: Make --help handle comma-separated $default_url
    
    Signed-off-by: James McCoy <jamessan at debian.org>
---
 debian/changelog    | 2 ++
 scripts/rmadison.pl | 6 +++++-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index d6dabf4..262e9cb 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -15,6 +15,8 @@ devscripts (2.15.1+exp1) UNRELEASED; urgency=medium
   * rmadison:
     + Display the usage to the specified fd instead of ignoring it.
     + Display the known URL aliases in the usage.
+    + Display all the URLs in --help when $default_url is a comma-separated
+      list.
 
   [ Johannes Schauer ]
   * chdist: Also set Apt::Architectures to prevent foreign architectures from
diff --git a/scripts/rmadison.pl b/scripts/rmadison.pl
index 3ad01ec..3e70bc0 100755
--- a/scripts/rmadison.pl
+++ b/scripts/rmadison.pl
@@ -62,6 +62,10 @@ if (system('dpkg-vendor', '--is', 'ubuntu') == 0) {
 
 sub usage($$) {
     my ($fd, $exit) = @_;
+    my @urls = split /,/, $default_url;
+    my $url = (@urls > 1) ? join(', and ', join(', ', @urls[0..$#urls-1]), $urls[-1])
+                          : $urls[0];
+
     print $fd <<EOT;
 Usage: rmadison [OPTION] PACKAGE[...]
 Display information about PACKAGE(s).
@@ -76,7 +80,7 @@ Display information about PACKAGE(s).
   -s, --suite=SUITE          only show info for this suite
   -S, --source-and-binary    show info for the binary children of source pkgs
   -t, --time                 show projectb snapshot date
-  -u, --url=URL              use URL instead of $url_map{$default_url}
+  -u, --url=URL              use URL instead of $url
 
   --noconf, --no-conf        don\'t read devscripts configuration files
 

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/collab-maint/devscripts.git