From: Michael Vogt <michael.vogt@ubuntu.com>
Date: Mon, 26 Jun 2006 04:30:09 +0000 (+0200)
Subject: * merged with mainline
X-Git-Tag: 0.7.24ubuntu1~254^2~3
X-Git-Url: https://git.saurik.com/apt.git/commitdiff_plain/a23dcda4a75ead3ef9712d90300f45155856b6ce?hp=--cc

* merged with mainline
---

a23dcda4a75ead3ef9712d90300f45155856b6ce
diff --cc apt-pkg/depcache.cc
index 22dd53f97,58d1d25e5..6eb6c1d85
--- a/apt-pkg/depcache.cc
+++ b/apt-pkg/depcache.cc
@@@ -16,44 -16,10 +16,45 @@@
  #include <apt-pkg/error.h>
  #include <apt-pkg/sptr.h>
  #include <apt-pkg/algorithms.h>
 +
 +#include <apt-pkg/fileutl.h>
  #include <apt-pkg/configuration.h>
 +#include <apt-pkg/pkgsystem.h>
 +#include <apt-pkg/tagfile.h>
 +
 +#include <iostream>
 +#include <sstream>    
+ 
  #include <apti18n.h>    
 -									/*}}}*/
 +
 +pkgDepCache::ActionGroup::ActionGroup(pkgDepCache &cache) :
 +  cache(cache), released(false)
 +{
 +  ++cache.group_level;
 +}
 +
 +void pkgDepCache::ActionGroup::release()
 +{
 +  if(!released)
 +    {
 +      if(cache.group_level == 0)
 +	std::cerr << "W: Unbalanced action groups, expect badness" << std::endl;
 +      else
 +	{
 +	  --cache.group_level;
 +
 +	  if(cache.group_level == 0)
 +	    cache.MarkAndSweep();
 +	}
 +
 +      released = false;
 +    }
 +}
 +
 +pkgDepCache::ActionGroup::~ActionGroup()
 +{
 +  release();
 +}
  
  // DepCache::pkgDepCache - Constructors					/*{{{*/
  // ---------------------------------------------------------------------
@@@ -837,9 -711,19 +838,14 @@@ void pkgDepCache::MarkInstall(PkgIterat
  	    }
  	 }
  	 
--	 if (InstPkg.end() == false)
++	 if (InstPkg.end() == false) 
+ 	 {
+ 	    if(_config->FindB("Debug::pkgDepCache::AutoInstall",false) == true)
+ 	       std::clog << "Installing " << InstPkg.Name() 
+ 			 << " as dep of " << Pkg.Name() 
+ 			 << std::endl;
 -	    MarkInstall(InstPkg,true,Depth + 1);
 -
 -	    // Set the autoflag, after MarkInstall because MarkInstall unsets it
 -	    if (P->CurrentVer == 0)
 -	       PkgState[InstPkg->ID].Flags |= Flag::Auto;
 +	   MarkInstall(InstPkg, true, Depth + 1, false);
- 	 
+ 	 }
 -	 
  	 continue;
        }
        
diff --cc debian/rules
index 94e3e2216,a8bf88762..044f742d0
--- a/debian/rules
+++ b/debian/rules
@@@ -335,6 -336,6 +336,6 @@@ cvs-mkul
  arch-build:
  	rm -rf debian/arch-build
  	mkdir -p debian/arch-build/apt-$(APT_DEBVER)
- 	baz inventory -s | xargs cp -a --parents --target=debian/arch-build/apt-$(APT_DEBVER)
+ 	tar -c --exclude=arch-build --no-recursion -f - `bzr inventory` | (cd debian/arch-build/$(PKG)-$(APT_DEBVER);tar xf -)
  	$(MAKE) -C debian/arch-build/apt-$(APT_DEBVER) startup doc
 -	(cd debian/arch-build/apt-$(APT_DEBVER); $(DEB_BUILD_PROG))
 +	(cd debian/arch-build/apt-$(APT_DEBVER); $(DEB_BUILD_PROG); dpkg-genchanges -S > ../apt_$(APT_DEBVER)_source.changes)
diff --cc share/debian-archive.gpg
index bb5ed5033,ce412117d..000000000
deleted file mode 100644,100644
Binary files differ
diff --cc share/debian-archive.gpg.moved
index 000000000,000000000..bb5ed5033
new file mode 100644
Binary files differ