tags 546647 + fixed-upstream patch pending thanks On Mon, Sep 14, 2009 at 04:06:20PM -0400, Nelson Elhage wrote: > Running sbuild on a local .dsc file with --append-to-version fails, > because sbuild, when fetching sources, attempts to find a .dsc with a > name that includes the append-to-version tag, fails, and tries to look > up the source in apt.
This should also be fixed by the attached patch. Could you please check this one as well? Thanks, Roger -- .''`. Roger Leigh : :' : Debian GNU/Linux http://people.debian.org/~rleigh/ `. `' Printing on GNU/Linux? http://gutenprint.sourceforge.net/ `- GPG Public Key: 0x25BFB848 Please GPG sign your mail.
>From 0bbc20a5caf671c3f6d0d479a9a29ced43435212 Mon Sep 17 00:00:00 2001 From: Roger Leigh <[email protected]> Date: Wed, 16 Sep 2009 23:19:35 +0100 Subject: [PATCH 5/8] Sbuild::Build: Add OSVersion version OSVersion is the original version with a stripped epoch. This complements SVersion which is the amended version with a stripped epoch, and is used to set the 'DSC File' attribute. --- lib/Sbuild/Build.pm | 14 +++++++++++--- 1 files changed, 11 insertions(+), 3 deletions(-) diff --git a/lib/Sbuild/Build.pm b/lib/Sbuild/Build.pm index fc54295..4469156 100644 --- a/lib/Sbuild/Build.pm +++ b/lib/Sbuild/Build.pm @@ -91,10 +91,12 @@ sub new { debug("DSC Dir = " . $self->get('DSC Dir') . "\n"); debug("Package_Version = " . $self->get('Package_Version') . "\n"); debug("Package_OVersion = " . $self->get('Package_OVersion') . "\n"); + debug("Package_OSVersion = " . $self->get('Package_OSVersion') . "\n"); debug("Package_SVersion = " . $self->get('Package_SVersion') . "\n"); debug("Package = " . $self->get('Package') . "\n"); debug("Version = " . $self->get('Version') . "\n"); debug("OVersion = " . $self->get('OVersion') . "\n"); + debug("OSVersion = " . $self->get('OSVersion') . "\n"); debug("SVersion = " . $self->get('SVersion') . "\n"); debug("VersionEpoch = " . $self->get('VersionEpoch') . "\n"); debug("VersionUpstream = " . $self->get('VersionUpstream') . "\n"); @@ -150,7 +152,10 @@ sub set_version { debug("Setting package version: $pkgv\n"); my ($pkg, $version) = split /_/, $pkgv; - my $oversion = $version; # Original version (no binNMU addition) + # Original version (no binNMU or other addition) + my $oversion = $version; + # Original version with stripped epoch + (my $osversion = $version) =~ s/^\d+://; # Add binNMU to version if needed. if ($self->get_conf('BIN_NMU') || $self->get_conf('APPEND_TO_VERSION')) { @@ -158,7 +163,8 @@ sub set_version { $self->get_conf('APPEND_TO_VERSION')); } - (my $sversion = $version) =~ s/^\d+://; # Strip epoch + # Version with binNMU or other additions and stripped epoch + (my $sversion = $version) =~ s/^\d+://; my ($epoch, $uversion, $dversion) = split_version($version); @@ -166,13 +172,15 @@ sub set_version { $self->set('Version', $version); $self->set('Package_Version', "${pkg}_$version"); $self->set('Package_OVersion', "${pkg}_$oversion"); + $self->set('Package_OSVersion', "${pkg}_$osversion"); $self->set('Package_SVersion', "${pkg}_$sversion"); $self->set('OVersion', $oversion); + $self->set('OSVersion', $osversion); $self->set('SVersion', $sversion); $self->set('VersionEpoch', $epoch); $self->set('VersionUpstream', $uversion); $self->set('VersionDebian', $dversion); - $self->set('DSC File', "${pkg}_${sversion}.dsc"); + $self->set('DSC File', "${pkg}_${osversion}.dsc"); $self->set('DSC Dir', "${pkg}-${uversion}"); } -- 1.6.3.3
>From 8f828f90135c6297e5c99ed1f280ba8a9027ed1f Mon Sep 17 00:00:00 2001 From: Roger Leigh <[email protected]> Date: Wed, 16 Sep 2009 23:22:16 +0100 Subject: [PATCH 6/8] debian: Close #546647 --- debian/changelog | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/debian/changelog b/debian/changelog index 8bd4b37..ebd7ca4 100644 --- a/debian/changelog +++ b/debian/changelog @@ -6,8 +6,11 @@ sbuild (0.59.1~rc1) unstable; urgency=low time when many chroots exist (Closes: #546624). Thanks to Nelson Elhage for finding this issue and suggesting a suitable approach for fixing it. + * Don't append binNMU or extra version to version number for use + in the DSC filename (Closes: #546647). Thanks to Nelson Elhage + for finding this issue. - -- Roger Leigh <[email protected]> Wed, 16 Sep 2009 22:23:56 +0100 + -- Roger Leigh <[email protected]> Wed, 16 Sep 2009 23:20:40 +0100 sbuild (0.59.0-1) unstable; urgency=low -- 1.6.3.3
