This is an automated email from the git hooks/post-receive script. jamessan pushed a commit to branch master in repository devscripts.
commit 757b1b4715515043115baca9e6ed31c2140f5221 Author: James McCoy <[email protected]> Date: Mon Jan 12 23:11:39 2015 -0500 rmadison: Use api.ftp-master.debian.org for debian & new URLs This fixes handling of the -b option since api.ftp-master.debian.org actually understands the parameter. Closes: #775084 Signed-off-by: James McCoy <[email protected]> --- debian/changelog | 2 ++ scripts/rmadison.pl | 13 +++++++------ 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/debian/changelog b/debian/changelog index 9ad8ac4..d945290 100644 --- a/debian/changelog +++ b/debian/changelog @@ -18,6 +18,8 @@ devscripts (2.15.1+exp1) UNRELEASED; urgency=medium + Display all the URLs in --help when $default_url is a comma-separated list. + Remove 404ing myon and debug URLs + + Use https://api.ftp-master.debian.org/madison for debian and new URLs. + This also fixes support for the -b option. (Closes: #775084) [ Johannes Schauer ] * chdist: Also set Apt::Architectures to prevent foreign architectures from diff --git a/scripts/rmadison.pl b/scripts/rmadison.pl index 0195097..9db6e4f 100755 --- a/scripts/rmadison.pl +++ b/scripts/rmadison.pl @@ -47,13 +47,13 @@ EOT } my %url_map = ( - 'debian' => "https://qa.debian.org/madison.php";, + 'debian' => "https://api.ftp-master.debian.org/madison";, + 'new' => "https://api.ftp-master.debian.org/madison?s=new";, 'qa' => "https://qa.debian.org/madison.php";, 'ubuntu' => "http://people.canonical.com/~ubuntu-archive/madison.cgi";, 'udd' => 'https://qa.debian.org/cgi-bin/madison.cgi', - 'new' => 'https://qa.debian.org/cgi-bin/madison.cgi?table=new', ); -my $default_url = 'debian,new'; +my $default_url = 'debian'; if (system('dpkg-vendor', '--is', 'ubuntu') == 0) { $default_url = 'ubuntu'; } @@ -275,10 +275,11 @@ show projectb snapshot and reload time (not supported by all archives) =item B<-u>, B<--url=>I<URL>[B<,>I<URL> ...] use I<URL> for the query. Supported shorthands are - B<debian> or B<qa> https://qa.debian.org/madison.php + B<debian> https://api.ftp-master.debian.org/madison + B<new> https://api.ftp-master.debian.org/madison?s=new + B<qa> https://qa.debian.org/madison.php B<ubuntu> http://people.canonical.com/~ubuntu-archive/madison.cgi B<udd> https://qa.debian.org/cgi-bin/madison.cgi - B<new> https://qa.debian.org/cgi-bin/madison.cgi?table=new See the B<RMADISON_URL_MAP_> variable below for a method to add new shorthands. @@ -317,7 +318,7 @@ B<RMADISON_URL_MAP_*> variables. =item B<RMADISON_DEFAULT_URL>=I<URL> Set the default URL to use unless overridden by a command line option. -For Debian this defaults to debian,new. For Ubuntu this defaults to ubuntu. +For Debian this defaults to debian. For Ubuntu this defaults to ubuntu. =item B<RMADISON_ARCHITECTURE>=I<ARCH> -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/collab-maint/devscripts.git _______________________________________________ devscripts-devel mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/devscripts-devel
