diff options
author | Michael Vogt <michael.vogt@ubuntu.com> | 2011-08-01 15:30:50 +0200 |
---|---|---|
committer | Michael Vogt <michael.vogt@ubuntu.com> | 2011-08-01 15:30:50 +0200 |
commit | f96bcef72c47ab32f4742da2673a12b3a47d8367 (patch) | |
tree | 671e533c88e15554d175c3c0c8897faf14a2415d /apt-pkg/pkgcachegen.cc | |
parent | cfba1fd82dde4d73c8856c50e2f9c8ca57af0a56 (diff) | |
parent | 7ca05341380434ae9e557d16d1ae88d133f0490c (diff) |
merged from the debian-sid branch
Diffstat (limited to 'apt-pkg/pkgcachegen.cc')
-rw-r--r-- | apt-pkg/pkgcachegen.cc | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/apt-pkg/pkgcachegen.cc b/apt-pkg/pkgcachegen.cc index efd764b51..2bfb77609 100644 --- a/apt-pkg/pkgcachegen.cc +++ b/apt-pkg/pkgcachegen.cc @@ -636,7 +636,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 |