apt-pkg/contrib/fileutl.cc: Revert WriteEmpty to old behavior (LP: #613211)

diff --git a/apt-pkg/contrib/fileutl.cc b/apt-pkg/contrib/fileutl.cc
index f86bf2942ea011f14059ea7547c5e40aad61f4aa..91aecee652f863f12dc97a5e2c3b28ffac45b489 100644 (file)
--- a/apt-pkg/contrib/fileutl.cc
+++ b/apt-pkg/contrib/fileutl.cc
@@ -670,7 +670,6 @@ bool FileFd::Open(string FileName,OpenMode Mode, unsigned long Perms)
       break;
       
       case WriteAtomic:
       break;
       
       case WriteAtomic:

-      case WriteEmpty:

       {
         Flags |= Replace;
         char *name = strdup((FileName + ".XXXXXX").c_str());
       {
         Flags |= Replace;
         char *name = strdup((FileName + ".XXXXXX").c_str());


@@ -680,6 +679,14 @@ bool FileFd::Open(string FileName,OpenMode Mode, unsigned long Perms)
         break;
       }
 
         break;
       }
 

+      case WriteEmpty:
+      {
+        struct stat Buf;
+        if (lstat(FileName.c_str(),&Buf) == 0 && S_ISLNK(Buf.st_mode))
+           unlink(FileName.c_str());
+        iFd = open(FileName.c_str(),O_RDWR | O_CREAT | O_TRUNC,Perms);
+        break;
+      }

       
       case WriteExists:
       iFd = open(FileName.c_str(),O_RDWR);
       
       case WriteExists:
       iFd = open(FileName.c_str(),O_RDWR);

diff --git a/debian/changelog b/debian/changelog
index 9f3d1df85f42e1db3ab165ff36dd13e163dfe3d2..0f3d0d499e2b6a1ef8a85ab8eccc1008c54ba930 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -11,6 +11,7 @@ apt (0.7.26~exp13) UNRELEASEDexperimental; urgency=low
   [ Julian Andres Klode ]
   * apt-pkg/contrib/fileutl.cc:
     - Add WriteAtomic mode.
   [ Julian Andres Klode ]
   * apt-pkg/contrib/fileutl.cc:
     - Add WriteAtomic mode.

+    - Revert WriteEmpty to old behavior (LP: #613211)

   * apt-pkg/depcache.cc:
     - Only try upgrade for Breaks if there is a newer version, otherwise
       handle it as Conflicts (by removing it) (helps for #591882).
   * apt-pkg/depcache.cc:
     - Only try upgrade for Breaks if there is a newer version, otherwise
       handle it as Conflicts (by removing it) (helps for #591882).