diff options
| author | Michael Vogt <michael.vogt@ubuntu.com> | 2006-09-28 00:48:50 +0200 |
|---|---|---|
| committer | Michael Vogt <michael.vogt@ubuntu.com> | 2006-09-28 00:48:50 +0200 |
| commit | bdce936af01878a0f2ff3056621e3278e17d1ae3 (patch) | |
| tree | 2d8b97500c37a11fed9bcb976d06d69892df9726 | |
| parent | 360aa3f32b747825d524fb2a9bb6a97e83c97505 (diff) | |
| parent | be0a16728d441e6b37f647e0b989b173cca0c142 (diff) | |
* cmdline/apt-get.cc:
- merged from apt--tasks, fix auto-install problem with tasks
* debian/changelog:
- new upload
| -rw-r--r-- | cmdline/apt-get.cc | 2 | ||||
| -rw-r--r-- | configure.in | 2 | ||||
| -rw-r--r-- | debian/changelog | 8 |
3 files changed, 10 insertions, 2 deletions
diff --git a/cmdline/apt-get.cc b/cmdline/apt-get.cc index 6ea0d3727..9a3140428 100644 --- a/cmdline/apt-get.cc +++ b/cmdline/apt-get.cc @@ -1530,7 +1530,7 @@ bool TryInstallTask(pkgDepCache &Cache, pkgProblemResolver &Fix, buf[end-start] = 0x0; if (regexec(&Pattern,buf,0,0,0) != 0) continue; - res &= TryToInstall(Pkg,Cache,Fix,false,BrokenFix,ExpectedInst); + res &= TryToInstall(Pkg,Cache,Fix,false,true,ExpectedInst); found = true; } diff --git a/configure.in b/configure.in index 098e56e97..9639cffc5 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.45ubuntu13") +AC_DEFINE_UNQUOTED(VERSION,"0.6.45ubuntu14") PACKAGE="apt" AC_DEFINE_UNQUOTED(PACKAGE,"$PACKAGE") AC_SUBST(PACKAGE) diff --git a/debian/changelog b/debian/changelog index d49ee5688..cd38465d0 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +apt (0.6.45ubuntu14) edgy; urgency=low + + * cmdline/apt-get.cc: + - fix in the TryInstallTask() code to make sure that all package + there are marked manual install (lp: #61684) + + -- Michael Vogt <michael.vogt@ubuntu.com> Thu, 28 Sep 2006 00:34:20 +0200 + apt (0.6.45ubuntu13) edgy; urgency=low * no-changes upload to make apt rebuild against latest g++ and |