Просмотр исходного кода

dpkg: Do not print unambiguous epoch on dpkg file overwrite error

Guillem Jover лет назад: 16
Родитель
Сommit
70b29e3e9e
2 измененных файлов с 3 добавлено и 2 удалено
  1. 1 0
      debian/changelog
  2. 2 2
      src/archives.c

+ 1 - 0
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

+ 2 - 2
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));
           }
         }
       }