diff options
| author | Michael Vogt <egon@bottom> | 2006-07-25 16:06:42 +0200 |
|---|---|---|
| committer | Michael Vogt <egon@bottom> | 2006-07-25 16:06:42 +0200 |
| commit | 5b1df5f0f00dff79fe3297270efa0626f80a02da (patch) | |
| tree | 90f57cce740e6edcd443f44308b3b6390dd3a875 | |
| parent | df78a81e47daa9de9d26f9bbc28708c8cd8fc6e4 (diff) | |
| parent | a4decc40b3eb085ea994d2a8b31ee9cddfd570ff (diff) | |
* merged with the current auto-mark branch
| -rw-r--r-- | apt-pkg/depcache.cc | 10 | ||||
| -rw-r--r-- | cmdline/apt-get.cc | 2 | ||||
| -rw-r--r-- | configure.in | 2 | ||||
| -rw-r--r-- | debian/changelog | 7 |
4 files changed, 20 insertions, 1 deletions
diff --git a/apt-pkg/depcache.cc b/apt-pkg/depcache.cc index 7663d3881..369eae70b 100644 --- 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 30d046447..8b3c68573 100644 --- 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 f0eb6e8f9..5b60e3070 100644 --- 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 d21348047..73bd84f21 100644 --- 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 |