The following commit has been merged in the master branch:
commit 70b29e3e9e2def64145c908bce4cb2922ddc8f19
Author: Guillem Jover <[email protected]>
Date: Sat Feb 6 22:07:20 2010 +0100
dpkg: Do not print unambiguous epoch on dpkg file overwrite error
diff --git a/debian/changelog b/debian/changelog
index 02d5a43..161b079 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -62,6 +62,7 @@ dpkg (1.15.6) UNRELEASED; urgency=low
* Validate compression level on dpkg-deb argument parsing.
* Fix error handling, clean up and refactor compression code.
Thanks to Jonathan Nieder for several of the patches.
+ * Do not print unambiguous epoch on dpkg file overwrite error.
[ Modestas Vainius ]
* Implement symbol patterns (Closes: #563752). From now on, it is possible to
diff --git a/src/archives.c b/src/archives.c
index 77d67ce..0d1d9d4 100644
--- a/src/archives.c
+++ b/src/archives.c
@@ -552,7 +552,7 @@ int tarobject(struct TarInfo *ti) {
"in package %.250s %.250s with nondirectory"),
nifd->namenode->name, otherpkg->name,
versiondescribe(&otherpkg->installed.version,
- vdew_always));
+ vdew_nonambig));
} else {
/* WTA: At this point we are replacing something without a
Replaces.
* if the new object is a directory and the previous object does not
@@ -564,7 +564,7 @@ int tarobject(struct TarInfo *ti) {
"which is also in package %.250s %.250s"),
nifd->namenode->name, otherpkg->name,
versiondescribe(&otherpkg->installed.version,
- vdew_always));
+ vdew_nonambig));
}
}
}
--
dpkg's main repository
--
To UNSUBSCRIBE, email to [email protected]
with a subject of "unsubscribe". Trouble? Contact [email protected]
