Просмотр исходного кода

* apt-pkg/packagemanager.cc, apt-pkg/deb/dpkgpm.cc:
- move the state file writting into the Go() implementation
of dpkgpm (closes: #498799)

Michael Vogt лет назад: 18
Родитель
Сommit
b462d75aab
3 измененных файлов с 5 добавлено и 4 удалено
  1. 2 0
      apt-pkg/deb/dpkgpm.cc
  2. 0 4
      apt-pkg/packagemanager.cc
  3. 3 0
      debian/changelog

+ 2 - 0
apt-pkg/deb/dpkgpm.cc

@@ -927,6 +927,8 @@ bool pkgDPkgPM::Go(int OutStatusFd)
 
 
    if (RunScripts("DPkg::Post-Invoke") == false)
    if (RunScripts("DPkg::Post-Invoke") == false)
       return false;
       return false;
+
+   Cache.writeStateFile(NULL);
    return true;
    return true;
 }
 }
 									/*}}}*/
 									/*}}}*/

+ 0 - 4
apt-pkg/packagemanager.cc

@@ -666,10 +666,6 @@ pkgPackageManager::DoInstallPostFork(int statusFd)
       if(goResult == false) 
       if(goResult == false) 
 	 return Failed;
 	 return Failed;
 
 
-      // if all was fine update the state file
-      if(Res == Completed) {
-	 Cache.writeStateFile(NULL);
-      }
       return Res;
       return Res;
 };
 };
 
 

+ 3 - 0
debian/changelog

@@ -45,6 +45,9 @@ apt (0.7.15) UNRELEASED; urgency=low
   * apt-pkg/pkgcachegen.cc:
   * apt-pkg/pkgcachegen.cc:
     - do not add multiple identical descriptions for the same 
     - do not add multiple identical descriptions for the same 
       language (closes: #400768)
       language (closes: #400768)
+  * apt-pkg/packagemanager.cc, apt-pkg/deb/dpkgpm.cc:
+    - move the state file writting into the Go() implementation
+      of dpkgpm (closes: #498799)
   
   
   [ Dereck Wonnacott ]
   [ Dereck Wonnacott ]
   * apt-ftparchive might write corrupt Release files (LP: #46439)
   * apt-ftparchive might write corrupt Release files (LP: #46439)