[dpkg] 64/187: dpkg-split: Do not emit epochs for unambiguous versions in deb-split header

[Reiner Herrmann]

This is an automated email from the git hooks/post-receive script.

deki-guest pushed a commit to branch master
in repository dpkg.

commit 31d3ed62687e99d2a22a942aa6c83e579863192a
Author: Guillem Jover <guillem at debian.org>
Date:   Sat Aug 20 19:43:08 2016 +0200

    dpkg-split: Do not emit epochs for unambiguous versions in deb-split header
    
    Regression introduced in commit ce4f0311e6e7a7b5125c4e881a0f2d3a8e1eea45.
---
 debian/changelog   | 2 ++
 dpkg-split/split.c | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 049bbf2..d49a464 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -11,6 +11,8 @@ dpkg (1.18.11) UNRELEASED; urgency=medium
   * Remove obsolete dpkg --print-installation-architecture option.
   * Fix dpkg error messages when parsing md5sum files to include the package
     name affected.
+  * Do not emit epochs for unambiguous versions in deb-split package header.
+    Regression introduced in dpkg 1.18.0.
   * Perl modules:
     - Obsolete Source-Version substvar in Dpkg::Substvars by emitting errors.
   * Packaging:
diff --git a/dpkg-split/split.c b/dpkg-split/split.c
index fd47aea..08916cb 100644
--- a/dpkg-split/split.c
+++ b/dpkg-split/split.c
@@ -141,7 +141,7 @@ mksplit(const char *file_src, const char *prefix, off_t maxpartsize,
 	lseek(fd_src, 0, SEEK_SET);
 
 	pkg  = deb_parse_control(file_src);
-	version = versiondescribe(&pkg->available.version, vdew_always);
+	version = versiondescribe(&pkg->available.version, vdew_nonambig);
 
 	partsize = maxpartsize - HEADERALLOWANCE;
 	last_partsize = st.st_size % partsize;

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/reproducible/dpkg.git