From: Michael Vogt <mvo@debian.org>
Date: Fri, 1 Aug 2014 09:06:47 +0000 (+0200)
Subject: mve MetaKey into pkgAcqBaseIndex
X-Git-Tag: 1.1.exp4~6^2~69
X-Git-Url: https://git.saurik.com/apt.git/commitdiff_plain/80976dd5452a9cfbe0c4f6229c729711ba685a5f

mve MetaKey into pkgAcqBaseIndex
---

diff --git a/apt-pkg/acquire-item.cc b/apt-pkg/acquire-item.cc
index da8402ffc..43c09e7b5 100644
--- a/apt-pkg/acquire-item.cc
+++ b/apt-pkg/acquire-item.cc
@@ -1010,7 +1010,6 @@ void pkgAcqIndex::Init(string const &URI, string const &URIDesc, string const &S
    DestFile += URItoFileName(URI);
 
    std::string const comprExt = CompressionExtension.substr(0, CompressionExtension.find(' '));
-   std::string MetaKey;
    if (comprExt == "uncompressed")
    {
       Desc.URI = URI;
diff --git a/apt-pkg/acquire-item.h b/apt-pkg/acquire-item.h
index 3f7cca083..f5a308c58 100644
--- a/apt-pkg/acquire-item.h
+++ b/apt-pkg/acquire-item.h
@@ -532,6 +532,8 @@ class pkgAcqBaseIndex : public pkgAcquire::Item
     */
    const struct IndexTarget * Target;
    indexRecords *MetaIndexParser;
+   /** \brief The MetaIndex Key */
+   std::string MetaKey;
 
    pkgAcqBaseIndex(pkgAcquire *Owner,
                    unsigned long TransactionID,
@@ -851,6 +853,7 @@ class pkgAcqIndex : public pkgAcqBaseIndex
     */
    bool Erase;
 
+   // FIXME:
    // Unused, used to be used to verify that "Packages: " header was there
    bool __DELME_ON_NEXT_ABI_BREAK_Verify;
 
diff --git a/test/integration/test-apt-update-rollback b/test/integration/test-apt-update-rollback
index a6297792e..d7078d217 100755
--- a/test/integration/test-apt-update-rollback
+++ b/test/integration/test-apt-update-rollback
@@ -44,7 +44,9 @@ test_inrelease_to_new_inrelease() {
     testequal "old/unstable 1.0 all" apt list -q
 
     add_new_package
-    testsuccess aptget update
+    aptget update -o Debug::Acquire::Transaction=1
+
+    testsuccess aptget update -o Debug::Acquire::Transaction=1
 
     testequal "new/unstable 1.0 all
 old/unstable 1.0 all" apt list -q