Package: devscripts
Version: 2.13.9
Severity: normal
Tags: patch
Hi,
This is a quick fix for an annoying behaviour whenever you are dealing with
watch files with a regex in the directories, as the ones used by the KDE team:
version=3
ftp://ftp.kde.org/pub/kde/stable/([\d\.]*)/src/kde-workspace-([\d\.]*).tar.xz
The current code list all the directories in the contents of
ftp://ftp.kde.org/pub/kde/stable/ and returns the newest after being sort by
Devscripts::Versort::upstream_versort, ignoring the --download-version option
the user might have passed.
The attached patch changes this behavior in the ftp part of the code, but a
similar idea could easily be applied to the http part of the code, if it's
considered useful.
-- Package-specific info:
--- /etc/devscripts.conf ---
--- ~/.devscripts ---
BTS_CACHE_MODE=full
DEBSIGN_KEYID=B29B232A
DEBUILD_PREPEND_PATH=/usr/lib/ccache
-- System Information:
Debian Release: jessie/sid
APT prefers testing
APT policy: (500, 'testing')
Architecture: amd64 (x86_64)
Kernel: Linux 3.12-1-amd64 (SMP w/4 CPU cores)
Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
Versions of packages devscripts depends on:
ii dpkg-dev 1.17.5
ii libc6 2.17-97
ii perl 5.18.1-5
ii python3 3.3.2-17
pn python3:any <none>
Versions of packages devscripts recommends:
ii at 3.1.14-1
ii curl 7.34.0-1
ii dctrl-tools 2.23
ii debian-keyring 2013.12.13
ii dput 0.9.6.4
ii equivs 2.0.9
ii fakeroot 1.20-1
ii gnupg 1.4.15-3
ii libdistro-info-perl 0.11
ii libencode-locale-perl 1.03-1
ii libjson-perl 2.61-1
ii liblwp-protocol-https-perl 6.04-2
ii libparse-debcontrol-perl 2.005-4
ii libsoap-lite-perl 0.716-1
ii liburi-perl 1.60-1
ii libwww-perl 6.05-2
ii lintian 2.5.20
ii man-db 2.6.5-2
ii patch 2.7.1-4
ii patchutils 0.3.2-3
ii python3-debian 0.1.21+nmu2
ii python3-magic 1:5.14-2
ii sensible-utils 0.0.9
ii strace 4.5.20-2.3
ii unzip 6.0-10
ii wdiff 1.2.1-1
ii wget 1.14-5
ii xz-utils 5.1.1alpha+20120614-2
Versions of packages devscripts suggests:
ii bsd-mailx [mailx] 8.1.2-0.20131005cvs-1
ii build-essential 11.6
pn cvs-buildpackage <none>
pn devscripts-el <none>
ii gnuplot 4.6.4-1
ii gpgv 1.4.15-3
ii libauthen-sasl-perl 2.1500-1
ii libfile-desktopentry-perl 0.07-1
ii libnet-smtp-ssl-perl 1.01-3
pn libterm-size-perl <none>
ii libtimedate-perl 2.3000-1
pn libyaml-syck-perl <none>
ii mutt 1.5.21-6.4
ii openssh-client [ssh-client] 1:6.4p1-2
pn svn-buildpackage <none>
ii w3m 0.5.3-13
-- no debconf information
--- /usr/bin/uscan 2013-12-23 17:31:35.000000000 -0300
+++ uscan.pl 2014-01-09 11:29:49.685459229 -0300
@@ -1809,6 +1809,15 @@
foreach my $dir (@dirs) { print STDERR " $$dir[1]\n"; }
}
@dirs = Devscripts::Versort::upstream_versort(@dirs);
+ if ($download_version) {
+ print STDERR " $download_version\n";
+ foreach my $dir (@dirs) {
+ if ($$dir[0] eq $download_version) {
+ print STDERR "Found it: $$dir[2]\n";
+ return $$dir[1];
+ }
+ }
+ }
my ($newversion, $newdir) = @{$dirs[0]};
return $newdir;
} else {
_______________________________________________
devscripts-devel mailing list
[email protected]
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/devscripts-devel
