Merge lp:~mvo/apt/lp1045704 into lp:~mvo/apt/mvo

[Michael Vogt]

Fix bug #1045704 by removing old leftovers from the atomic writes.

[Michael Vogt (mvo)]

This will fix the problem at hand. We could make it more generic by:
- make the extension for Atomic writes more uniq (e.g. appending .apt-atomic-write.XXXXX)
- do the Glob()/unlink() on all previous instances of any $filename.apt-atomic.*

This sounds a little bit dangerous this is why I did not do it this way currently, but
its probably a good idea.

Unmerged revisions

1846. By Michael Vogt on 2012-09-04

apt-pkg/pkgcachegen.cc: use the new Glob() function to clean the old atomic write leftovers

1845. By Michael Vogt on 2012-09-04

add "Glob()" to fileutl

=== modified file 'apt-pkg/contrib/fileutl.cc'
--- apt-pkg/contrib/fileutl.cc	2012-03-06 09:53:35 +0000
+++ apt-pkg/contrib/fileutl.cc	2012-09-04 10:37:18 +0000
@@ -41,6 +41,8 @@
 #include <dirent.h>
 #include <signal.h>
 #include <errno.h>
+#include <glob.h>
+
 #include <set>
 #include <algorithm>
 
@@ -1552,3 +1554,32 @@
 									/*}}}*/
 
 gzFile FileFd::gzFd() { return (gzFile) d->gz; }
+
+
+// Glob - wrapper around "glob()"                                      /*{{{*/
+// ---------------------------------------------------------------------
+/* */
+std::vector<std::string> Glob(std::string const &pattern, int flags)
+{
+   std::vector<std::string> result;
+   glob_t globbuf;
+   int glob_res, i;
+
+   glob_res = glob(pattern.c_str(),  flags, NULL, &globbuf);
+
+   if (glob_res != 0)
+   {
+      if(glob_res != GLOB_NOMATCH) {
+         _error->Errno("glob", "Problem with glob");
+         return result;
+      }
+   }
+
+   // append results
+   for(i=0;i<globbuf.gl_pathc;i++)
+      result.push_back(string(globbuf.gl_pathv[i]));
+
+   globfree(&globbuf);
+   return result;
+}
+									/*}}}*/

=== modified file 'apt-pkg/contrib/fileutl.h'
--- apt-pkg/contrib/fileutl.h	2012-02-11 21:36:03 +0000
+++ apt-pkg/contrib/fileutl.h	2012-09-04 10:37:18 +0000
@@ -186,4 +186,7 @@
 std::string flExtension(std::string File);
 std::string flCombine(std::string Dir,std::string File);
 
+// simple c++ glob
+std::vector<std::string> Glob(std::string const &pattern, int flags=0);
+
 #endif

=== modified file 'apt-pkg/pkgcachegen.cc'
--- apt-pkg/pkgcachegen.cc	2011-12-15 08:13:21 +0000
+++ apt-pkg/pkgcachegen.cc	2012-09-04 10:37:18 +0000
@@ -1270,6 +1270,15 @@
    if (Writeable == false && AllowMem == false && CacheFile.empty() == false)
       return _error->Error(_("Unable to write to %s"),flNotFile(CacheFile).c_str());
 
+   // Clean old leftover tempfiles from the AtomicWrite
+   std::vector<std::string> tmp_files, tmp_files2;
+   std::vector<std::string>::const_iterator it;
+   tmp_files = Glob(CacheFile+".*");
+   tmp_files2 = Glob(SrcCacheFile+".*");
+   tmp_files.insert(tmp_files.end(), tmp_files2.begin(), tmp_files2.end());
+   for (it=tmp_files.begin();it != tmp_files.end(); it++)
+      unlink((*it).c_str());
+  
    if (Progress != NULL)
       Progress->OverallProgress(0,1,1,_("Reading package lists"));
 

=== added file 'test/libapt/fileutl_test.cc'
--- test/libapt/fileutl_test.cc	1970-01-01 00:00:00 +0000
+++ test/libapt/fileutl_test.cc	2012-09-04 10:37:18 +0000
@@ -0,0 +1,42 @@
+#include <apt-pkg/error.h>
+#include <apt-pkg/fileutl.h>
+
+#include "assert.h"
+#include <string>
+#include <vector>
+
+#include <stdio.h>
+#include <iostream>
+#include <stdlib.h>
+
+
+int main(int argc,char *argv[])
+{
+   std::vector<std::string> files;
+
+   // normal match
+   files = Glob("*.lst");
+   if (files.size() != 1)
+   {
+      _error->DumpErrors();
+      return 1;
+   }
+
+   // not there
+   files = Glob("xxxyyyzzz");
+   if (files.size() != 0 || _error->PendingError())
+   {
+      _error->DumpErrors();
+      return 1;
+   }
+
+   // many matches (number is a bit random)
+   files = Glob("*.cc");
+   if (files.size() < 10)
+   {
+      _error->DumpErrors();
+      return 1;
+   }
+
+   return 0;
+}

=== modified file 'test/libapt/makefile'
--- test/libapt/makefile	2011-12-11 01:55:20 +0000
+++ test/libapt/makefile	2012-09-04 10:37:18 +0000
@@ -80,3 +80,9 @@
 SLIBS = -lapt-pkg
 SOURCE = cdromfindpackages_test.cc
 include $(PROGRAM_H)
+
+# test fileutls
+PROGRAM = FileUtl${BASENAME}
+SLIBS = -lapt-pkg 
+SOURCE = fileutl_test.cc
+include $(PROGRAM_H)