FWIW, while this is hashed out on the Debian side as to whether to
revert the change, or allow an override flag, or whatever, this is
what I've applied in Ubuntu to allow us to get on with life.  This
seems to me like a reasonable solution for now.  I realize most
people don't read warnings from dpkg-buildpackage but, on the other
hand, I also don't think people need to be halted in their workflow
due to a strict adherence to Debian policy in dpkg.

(As an aside, I do tend to consider our use-cases that allow mixed
version/format a bug, but some of them are a bit hard to solve, like
telling people doing automagic recipe builds that they now need to
have pristine-tar info in their branches when they didn't before.)

diff -Nru dpkg-1.17.5ubuntu2/debian/changelog 
dpkg-1.17.5ubuntu3/debian/changelog
--- dpkg-1.17.5ubuntu2/debian/changelog 2014-01-17 18:02:57.000000000 +0000
+++ dpkg-1.17.5ubuntu3/debian/changelog 2014-02-05 14:28:34.000000000 +0000
@@ -1,3 +1,10 @@
+dpkg (1.17.5ubuntu3) trusty; urgency=medium
+
+  * Change native source version/format mismatch errors into warnings until
+    the dust settles on Debian bug 737634 about revert or override options.
+
+ -- Adam Conrad <adcon...@ubuntu.com>  Wed, 05 Feb 2014 07:26:29 -0700
+
 dpkg (1.17.5ubuntu2) trusty; urgency=medium
 
   * Backport patch from 1.17.6 to fix file descriptor leaks (LP: #1270132)
diff -Nru dpkg-1.17.5ubuntu2/scripts/Dpkg/Source/Package/V3/Native.pm 
dpkg-1.17.5ubuntu3/scripts/Dpkg/Source/Package/V3/Native.pm
--- dpkg-1.17.5ubuntu2/scripts/Dpkg/Source/Package/V3/Native.pm 2013-12-10 
06:14:22.000000000 +0000
+++ dpkg-1.17.5ubuntu3/scripts/Dpkg/Source/Package/V3/Native.pm 2014-02-05 
14:26:25.000000000 +0000
@@ -69,7 +69,7 @@
     my ($self, $dir) = @_;
 
     my $v = Dpkg::Version->new($self->{fields}->{'Version'});
-    return (0, _g('native package version may not have a revision'))
+    warning (_g('native package version may not have a revision'))
         unless $v->is_native();
 
     return 1;
diff -Nru dpkg-1.17.5ubuntu2/scripts/Dpkg/Source/Package/V3/Quilt.pm 
dpkg-1.17.5ubuntu3/scripts/Dpkg/Source/Package/V3/Quilt.pm
--- dpkg-1.17.5ubuntu2/scripts/Dpkg/Source/Package/V3/Quilt.pm  2013-12-10 
06:14:22.000000000 +0000
+++ dpkg-1.17.5ubuntu3/scripts/Dpkg/Source/Package/V3/Quilt.pm  2014-02-05 
14:26:17.000000000 +0000
@@ -76,7 +76,7 @@
     return ($code, $msg) if $code == 0;
 
     my $v = Dpkg::Version->new($self->{fields}->{'Version'});
-    return (0, _g('version does not contain a revision')) if $v->is_native();
+    warning (_g('version does not contain a revision')) if $v->is_native();
 
     my $quilt = $self->build_quilt_object($dir);
     $msg = $quilt->find_problems();


-- 
To UNSUBSCRIBE, email to debian-bugs-dist-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org

Reply via email to