summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Vogt <michael.vogt@ubuntu.com>2006-09-16 12:02:02 +0200
committerMichael Vogt <michael.vogt@ubuntu.com>2006-09-16 12:02:02 +0200
commit42142a6cf63458599c6a11c398a25b301df2df55 (patch)
tree963fa5ea4c8ca33d7fd4eb1ca7568a51e94a5af4
parent2ca99a0dceb4101f1ecaff0348b1684cb975099c (diff)
* cmdline/apt-get.cc:
- merged patch from otavio to make the order of package selections less important
-rw-r--r--cmdline/apt-get.cc19
-rw-r--r--configure.in2
-rw-r--r--debian/changelog4
3 files changed, 19 insertions, 6 deletions
diff --git a/cmdline/apt-get.cc b/cmdline/apt-get.cc
index 64882e3e8..b33a324ea 100644
--- a/cmdline/apt-get.cc
+++ b/cmdline/apt-get.cc
@@ -1144,10 +1144,7 @@ bool TryToInstall(pkgCache::PkgIterator Pkg,pkgDepCache &Cache,
}
else
ExpectedInst++;
-
- // Install it with autoinstalling enabled.
- if (State.InstBroken() == true && BrokenFix == false)
- Cache.MarkInstall(Pkg,true);
+
return true;
}
/*}}}*/
@@ -1538,6 +1535,20 @@ bool DoInstall(CommandLine &CmdL)
}
}
+ for (unsigned J = 0; J < Cache->Head().PackageCount; J++)
+ {
+ pkgCache::PkgIterator I(Cache,Cache.List[J]);
+ if ((*Cache)[I].Install() == false)
+ continue;
+
+ pkgDepCache::StateCache &State = Cache[I];
+ // Install it with autoinstalling enabled (if we not respect the minial
+ // required deps or the policy)
+ if (State.InstBroken() == true && BrokenFix == false)
+ Cache->MarkInstall(I,true);
+ }
+
+
/* If we are in the Broken fixing mode we do not attempt to fix the
problems. This is if the user invoked install without -f and gave
packages */
diff --git a/configure.in b/configure.in
index f0b0d6703..dc410b22f 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.45.1")
+AC_DEFINE_UNQUOTED(VERSION,"0.6.46")
PACKAGE="apt"
AC_DEFINE_UNQUOTED(PACKAGE,"$PACKAGE")
AC_SUBST(PACKAGE)
diff --git a/debian/changelog b/debian/changelog
index 4c5841057..1ec80ca01 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-apt (0.6.45.1) unstable; urgency=low
+apt (0.6.46) unstable; urgency=low
* debian/control:
- switched to libdb4.4 for building (closes: #381019)
@@ -7,6 +7,8 @@ apt (0.6.45.1) unstable; urgency=low
versions of the package (closes: #257054)
- properly handle recommends/suggests or-groups when printing the list of
suggested/recommends packages (closes: #311619)
+ - fix the way multiple packages are installed so that the order of
+ packages on the commandline doesn't matter anymore
* methods/http.cc:
- check more careful for incorrect proxy settings (closes: #378868)
* methods/gzip.cc: