summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Vogt <michael.vogt@ubuntu.com>2011-08-01 13:56:09 +0200
committerMichael Vogt <michael.vogt@ubuntu.com>2011-08-01 13:56:09 +0200
commita1e9379a86f199817d275b2d28d1a6b61039fcaa (patch)
tree46aff20a5312e249f9f40df3a380acbf415ae41d
parent5763d19a89ea634fbd08aa8b97dd7ad8165fdab8 (diff)
parent77de0e831a12aedde05ff6bff8fb07dcbb4074ad (diff)
merged from lp:~mvo/apt/mvo
-rw-r--r--apt-pkg/pkgcachegen.cc6
-rw-r--r--debian/changelog2
2 files changed, 5 insertions, 3 deletions
diff --git a/apt-pkg/pkgcachegen.cc b/apt-pkg/pkgcachegen.cc
index 2b6d294fb..3c21b2442 100644
--- a/apt-pkg/pkgcachegen.cc
+++ b/apt-pkg/pkgcachegen.cc
@@ -637,7 +637,9 @@ bool pkgCacheGenerator::FinishCache(OpProgress *Progress)
Dynamic<pkgCache::VerIterator> DynV(V);
for (; V.end() != true; V++)
{
- char const * const Arch = P.Arch();
+ // copy P.Arch() into a string here as a cache remap
+ // in NewDepends() later may alter the pointer location
+ string Arch = P.Arch() == NULL ? "" : P.Arch();
map_ptrloc *OldDepLast = NULL;
/* MultiArch handling introduces a lot of implicit Dependencies:
- MultiArch: same → Co-Installable if they have the same version
@@ -646,7 +648,7 @@ bool pkgCacheGenerator::FinishCache(OpProgress *Progress)
bool const coInstall = ((V->MultiArch & pkgCache::Version::Same) == pkgCache::Version::Same);
for (vector<string>::const_iterator A = archs.begin(); A != archs.end(); ++A)
{
- if (Arch == 0 || *A == Arch)
+ if (*A == Arch)
continue;
/* We allow only one installed arch at the time
per group, therefore each group member conflicts
diff --git a/debian/changelog b/debian/changelog
index f648ac958..c36d82324 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-apt (0.8.16~exp5ubuntu1) UNRELEASEDoneiric; urgency=low
+apt (0.8.16~exp5ubuntu1~ppa1) oneiric; urgency=low
* merged from debian/experimental