* reverted otavios patch again because it breaks the following behaviour:

  A depends on X|Y
  B depends on Y
  With the old code we get:
  "apt-get install A B": we get "A B X Y"
  "apt-get install B A": we get "A B Y"
  With the new code there is no way to get this right and we always end
  up with "A B X Y" because we just go over the packages in the order
  that they are in the cache and run MarkInstall(AutoInstall=true) on
  them then. When A comes before B we always end up with the unneeded X
  dependency.

diff --git a/cmdline/apt-get.cc b/cmdline/apt-get.cc
index b33a324ea2eceb441c5b2504784a85948b663be8..64882e3e8875ad58672ae0c14f3f80964f207584 100644 (file)
--- a/cmdline/apt-get.cc
+++ b/cmdline/apt-get.cc
@@ -1144,7 +1144,10 @@ 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;
 }
                                                                        /*}}}*/
@@ -1535,20 +1538,6 @@ 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 dc410b22fb975588e5fa2d34b5483dd3de7b23bf..f0b0d6703af0f057455389e7258eefc6230852fd 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.46")
+AC_DEFINE_UNQUOTED(VERSION,"0.6.45.1")
 PACKAGE="apt"
 AC_DEFINE_UNQUOTED(PACKAGE,"$PACKAGE")
 AC_SUBST(PACKAGE)

diff --git a/debian/changelog b/debian/changelog
index 1ec80ca011c1bb42eb47401df508c4c5feb8877b..4c5841057ef254ee048af1fe08ca0ef1ab48a94f 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-apt (0.6.46) unstable; urgency=low
+apt (0.6.45.1) unstable; urgency=low
 
   * debian/control:
     - switched to libdb4.4 for building (closes: #381019)
@@ -7,8 +7,6 @@ apt (0.6.46) 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: