Sfoglia il codice sorgente

dpkg: fix rename deferral

Modern tar files typically use NormalFile1 rather than NormalFile0 for
file objects.  A typo meant that the former never triggered rename
deferral.
Colin Watson 16 anni fa
parent
commit
3927a9d6e6
2 ha cambiato i file con 6 aggiunte e 1 eliminazioni
  1. 5 0
      debian/changelog
  2. 1 1
      src/archives.c

+ 5 - 0
debian/changelog

@@ -27,6 +27,11 @@ dpkg (1.15.6.2) UNRELEASED; urgency=low
     should now start using dpkg-buildflags instead. Closes: #560070
   * For Ubuntu set default value of LDFLAGS to -Wl,-Bsymbolic-functions.
 
+  [ Colin Watson ]
+  * Modern tar files typically use NormalFile1 rather than NormalFile0 for
+    file objects. A typo meant that the former never triggered rename
+    deferral. Closes: #577756
+
   [ Updated dpkg translations ]
   * German (Sven Joachim).
 

+ 1 - 1
src/archives.c

@@ -779,7 +779,7 @@ int tarobject(struct TarInfo *ti) {
    * in dpkg-new.
    */
 
-  if (ti->Type == NormalFile0 || ti->Type == NormalFile0) {
+  if (ti->Type == NormalFile0 || ti->Type == NormalFile1) {
     nifd->namenode->flags |= fnnf_deferred_rename;
 
     debug(dbg_eachfiledetail, "tarobject done and installation deferred");