Package: devscripts Version: 2.10.65.1 Severity: normal Tags: patch Hi,
uscan calls system() with a list, so there's no need to use stuff like "'$variable'", that generates an extra couple of quotes, which dpkg doesn't like: | k...@bowmore:~/x/app/x11-xserver-utils.git$ LC_ALL=C uscan --no-conf --download --no-symlink --destdir . --package iceauth --upstream-version 1.0.3 --watchfile debian/watch.iceauth | dpkg: version ''1.0.3'' has bad syntax: invalid character in version number | dpkg: version ''1.0.3'' has bad syntax: invalid character in version number | iceauth: Newer version (1.0.3) available on remote site: | http://xorg.freedesktop.org/releases/individual/app/iceauth-1.0.3.tar.gz | (local version is 1.0.3) | iceauth: Successfully downloaded updated package iceauth-1.0.3.tar.gz Meaning we get to download all tarballs (see x11-xserver-utils's get-tarballs target), even though all of them are uptodate. Please find attached a tested patch. Mraw, KiBi. -- Package-specific info: --- /etc/devscripts.conf --- --- ~/.devscripts --- DEBUILD_PRESERVE_ENVVARS=PATH NMUDIFF_DELAY=2 DEBCHANGE_RELEASE_HEURISTIC=changelog DEBCHANGE_AUTO_NMU=no RMADISON_URL_MAP_udd=http://qa.debian.org/cgi-bin/madison.cgi DEBUILD_DPKG_BUILDPACKAGE_OPTS='-us -uc' -- System Information: Debian Release: sid APT prefers unstable APT policy: (500, 'unstable'), (500, 'testing'), (1, 'experimental') Architecture: amd64 (x86_64) Kernel: Linux 2.6.32-5-amd64 (SMP w/2 CPU cores) Locale: LANG=fr_FR.UTF-8, LC_CTYPE=fr_FR.UTF-8 (charmap=UTF-8) Shell: /bin/sh linked to /bin/dash Versions of packages devscripts depends on: ii dpkg-dev 1.15.8 Debian package development tools ii libc6 2.11.2-2 Embedded GNU C Library: Shared lib ii perl 5.10.1-13 Larry Wall's Practical Extraction Versions of packages devscripts recommends: ii at 3.1.12-1 Delayed job execution and batch pr ii bsd-mailx [mailx] 8.1.2-0.20100314cvs-1 simple mail user agent ii bzr 2.1.2-1 easy to use distributed version co ii chromium-browser 5.0.375.99~r51029-4+b1 Chromium browser ii conkeror [www-bro 0.9.2+git100420-2 keyboard focused web browser with ii curl 7.21.0-1 Get a file from an HTTP, HTTPS or ii cvs 1:1.12.13-12 Concurrent Versions System ii dctrl-tools 2.14 Command-line tools to process Debi ii debian-keyring [d 2010.06.08 GnuPG (and obsolete PGP) keys of D ii dput 0.9.6.1 Debian package upload tool ii equivs 2.0.8 Circumvent Debian package dependen ii fakeroot 1.14.4-1 Gives a fake root environment ii git [git-core] 1:1.7.1-1 fast, scalable, distributed revisi ii git-core 1:1.7.1-1 fast, scalable, distributed revisi ii gnupg 1.4.10-4 GNU privacy guard - a free PGP rep ii libauthen-sasl-pe 2.1500-1 Authen::SASL - SASL Authentication ii libcrypt-ssleay-p 0.57-2 Support for https protocol in LWP ii libjson-perl 2.21-1 Perl module to parse and convert t ii libparse-debcontr 2.005-2 Easy OO parsing of Debian control- ii libsoap-lite-perl 0.712-1 Perl implementation of a SOAP clie ii libterm-size-perl 0.2-4+b1 Perl extension for retrieving term ii libtimedate-perl 1.2000-1 collection of modules to manipulat ii liburi-perl 1.54-1 module to manipulate and access UR ii libwww-perl 5.836-1 Perl HTTP/WWW client/server librar ii libyaml-syck-perl 1.09-1 Perl module providing a fast, ligh ii lintian 2.4.2 Debian package checker ii lsb-release 3.2-23.1 Linux Standard Base version report ii lzma 4.43-14 Compression method of 7z format in ii man-db 2.5.7-3 on-line manual pager ii midori [www-brows 0.2.4-3 fast, lightweight graphical web br ii openssh-client [s 1:5.5p1-4 secure shell (SSH) client, for sec ii patch 2.6-2 Apply a diff file to an original ii patchutils 0.3.1-2 Utilities to work with patches ii sensible-utils 0.0.4 Utilities for sensible alternative ii strace 4.5.20-2 A system call tracer ii subversion 1.6.12dfsg-1 Advanced version control system ii unzip 6.0-4 De-archiver for .zip files ii w3m [www-browser] 0.5.2-7 WWW browsable pager with excellent ii wdiff 0.6.3-1 Compares two files word by word ii wget 1.12-2 retrieves files from the web ii xz-utils 4.999.9beta+20100713-1 XZ-format compression utilities Versions of packages devscripts suggests: ii build-essential 11.5 Informational list of build-essent pn cvs-buildpackage <none> (no description available) pn devscripts-el <none> (no description available) pn gnuplot <none> (no description available) pn libfile-desktopentry-perl <none> (no description available) ii libnet-smtp-ssl-perl 1.01-2 SSL support for Net::SMTP ii mutt 1.5.20-9 text-based mailreader supporting M pn svn-buildpackage <none> (no description available) ii w3m 0.5.2-7 WWW browsable pager with excellent -- no debconf information
>From c4922bf8d8ce8668e89bdc25c3fb70ff9ad34343 Mon Sep 17 00:00:00 2001 From: Cyril Brulebois <[email protected]> Date: Sat, 24 Jul 2010 17:00:44 +0200 Subject: [PATCH] uscan: Get rid of extra quoting in dpkg --compare-versions calls. Signed-off-by: Cyril Brulebois <[email protected]> --- scripts/uscan.pl | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/uscan.pl b/scripts/uscan.pl index c59b921..ec0df77 100755 --- a/scripts/uscan.pl +++ b/scripts/uscan.pl @@ -1194,7 +1194,7 @@ EOF # Can't just use $lastversion eq $newversion, as then 0.01 and 0.1 # compare different, whereas they are treated as equal by dpkg - if (system("dpkg", "--compare-versions", "'$mangled_lastversion'", "eq", "'$newversion'") == 0) { + if (system("dpkg", "--compare-versions", "$mangled_lastversion", "eq", "$newversion") == 0) { if ($verbose or ($download == 0 and $report and ! $dehs)) { print $pkg_report_header; $pkg_report_header = ''; @@ -1221,7 +1221,7 @@ EOF # We use dpkg's rules to determine whether our current version # is newer or older than the remote version. if (!defined $download_version) { - if (system("dpkg", "--compare-versions", "'$mangled_lastversion'", "gt", "'$newversion'") == 0) { + if (system("dpkg", "--compare-versions", "$mangled_lastversion", "gt", "$newversion") == 0) { if ($verbose) { print " => remote site does not even have current version\n"; } elsif ($dehs) { -- 1.7.1
