The following commit has been merged in the master branch:
commit 3927a9d6e64297330b61a38755bee20d45c7b166
Author: Colin Watson <[email protected]>
Date:   Wed Apr 14 10:00:18 2010 +0100

    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.

diff --git a/debian/changelog b/debian/changelog
index 3c14cc8..ab6ce47 100644
--- a/debian/changelog
+++ b/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).
 
diff --git a/src/archives.c b/src/archives.c
index 79fef4e..0608137 100644
--- a/src/archives.c
+++ b/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");

-- 
dpkg's main repository


-- 
To UNSUBSCRIBE, email to [email protected]
with a subject of "unsubscribe". Trouble? Contact [email protected]

Reply via email to