* merged with the current auto-mark branch

diff --git a/apt-pkg/depcache.cc b/apt-pkg/depcache.cc
index 7663d38814b16de97ad0a2fa62deb34edd6cee24..369eae70b3418d3a73e86bd2a125c87e42214636 100644 (file)
--- a/apt-pkg/depcache.cc
+++ b/apt-pkg/depcache.cc
@@ -186,6 +186,15 @@ bool pkgDepCache::writeStateFile(OpProgress *prog)
 
    FileFd StateFile;
    string state = _config->FindDir("Dir::State") + "extended_states";
+
+   // if it does not exist, create a empty one
+   if(!FileExists(state)) 
+   {
+      StateFile.Open(state, FileFd::WriteEmpty);
+      StateFile.Close();
+   }
+
+   // open it
    if(!StateFile.Open(state, FileFd::ReadOnly))
       return _error->Error(_("Failed to open StateFile %s"),
                           state.c_str());
@@ -242,6 +251,7 @@ bool pkgDepCache::writeStateFile(OpProgress *prog)
         fprintf(OutFile,"\n");
       }
    }
+   fclose(OutFile);
 
    // move the outfile over the real file
    rename(outfile.c_str(), state.c_str());

diff --git a/cmdline/apt-get.cc b/cmdline/apt-get.cc
index 30d0464476aa49f7af1db4b5f247c9a592dcdb96..8b3c6857366d5e929a9020affa5de056057cda7c 100644 (file)
--- a/cmdline/apt-get.cc
+++ b/cmdline/apt-get.cc
@@ -1771,6 +1771,8 @@ bool DoDSelectUpgrade(CommandLine &CmdL)
    if (Cache.OpenForInstall() == false || Cache.CheckDeps() == false)
       return false;
    
+   pkgDepCache::ActionGroup group(Cache);
+
    // Install everything with the install flag set
    pkgCache::PkgIterator I = Cache->PkgBegin();
    for (;I.end() != true; I++)

diff --git a/configure.in b/configure.in
index f0eb6e8f978e94462ca251ceb5d1fd5ee957efa4..5b60e30705ad6009ccc562468b359981ea9d9c70 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -18,7 +18,7 @@ AC_CONFIG_AUX_DIR(buildlib)
 AC_CONFIG_HEADER(include/config.h:buildlib/config.h.in include/apti18n.h:buildlib/apti18n.h.in)
 
 dnl -- SET THIS TO THE RELEASE VERSION --
-AC_DEFINE_UNQUOTED(VERSION,"0.6.44.2exp1")
+AC_DEFINE_UNQUOTED(VERSION,"0.6.44.2exp2")
 PACKAGE="apt"
 AC_DEFINE_UNQUOTED(PACKAGE,"$PACKAGE")
 AC_SUBST(PACKAGE)

diff --git a/debian/changelog b/debian/changelog
index d213480473fa0afbfc51617709dadd40000905b1..73bd84f216fc83921010c0a62bf984717607956f 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+apt (0.6.44.2exp2) experimental; urgency=low
+
+  * fix apt-get dist-upgrade
+  * fix warning if no /var/lib/apt/extended_states is present
+
+ -- Michael Vogt <mvo@debian.org>  Tue, 25 Jul 2006 15:12:05 +0200
+
 apt (0.6.44.2exp1) experimental; urgency=low
 
   * added support for i18n of the package descriptions