mve MetaKey into pkgAcqBaseIndex

diff --git a/apt-pkg/acquire-item.cc b/apt-pkg/acquire-item.cc
index da8402ffc2f18a06bb9eea86e01d8ba256a78d25..43c09e7b58f47da2740e671432f6535b560ef7c4 100644 (file)
--- 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 3f7cca0835ffcd6cbb4de2e3ce7c87e8d60e1500..f5a308c58f6c11c23f85be7ea53ad38d5c577253 100644 (file)
--- 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 a6297792eeaf0b01ea92227887097614c40d95f0..d7078d2176d5fbdc658e5d9c18cc8e3cced664d5 100755 (executable)
--- 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