Quellcode durchsuchen

* apt-pkg/pkgcache.cc:
- do not run "dpkg --configure pkg" if pkg is in trigger-awaited
state (LP: #322955)
- do not unlink files in partial/ (thanks to robbiew)

Michael Vogt vor 17 Jahren
Ursprung
Commit
7e522e9e0e
3 geänderte Dateien mit 10 neuen und 3 gelöschten Zeilen
  1. 6 2
      apt-pkg/pkgcache.cc
  2. 4 0
      debian/changelog
  3. 0 1
      methods/https.cc

+ 6 - 2
apt-pkg/pkgcache.cc

@@ -275,8 +275,12 @@ pkgCache::PkgIterator::OkState pkgCache::PkgIterator::State() const
    
    if (Pkg->CurrentState == pkgCache::State::UnPacked ||
        Pkg->CurrentState == pkgCache::State::HalfConfigured ||
-       Pkg->CurrentState == pkgCache::State::TriggersPending ||
-       Pkg->CurrentState == pkgCache::State::TriggersAwaited)
+      //we don't need to care for triggers awaiting packages
+      //dpkg will deal with them automatically when the 
+      //trigger pending action is run (those packages are usually
+      //in half-configured or triggers-pending state)
+      //Pkg->CurrentState == pkgCache::State::TriggersAwaited
+       Pkg->CurrentState == pkgCache::State::TriggersPending)
       return NeedsConfigure;
    
    if (Pkg->CurrentState == pkgCache::State::HalfInstalled ||

+ 4 - 0
debian/changelog

@@ -32,8 +32,12 @@ apt (0.7.20.2ubuntu1) jaunty; urgency=low
   * cmdline/apt-get.cc:
     - default to "false" for the "APT::Get::Build-Dep-Automatic"
       option (follow debian here)
+  * apt-pkg/pkgcache.cc:
+    - do not run "dpkg --configure pkg" if pkg is in trigger-awaited
+      state (LP: #322955)
   * methods/https.cc:
     - add Acquire::https::AllowRedirect support
+    - do not unlink files in partial/ (thanks to robbiew)
 
   [ Dereck Wonnacott ]
   * Clarify the --help for 'purge' (LP: #243948)

+ 0 - 1
methods/https.cc

@@ -253,7 +253,6 @@ bool HttpsMethod::Fetch(FetchItem *Itm)
    // cleanup
    if(success != 0) 
    {
-      unlink(File->Name().c_str());
       _error->Error("%s", curl_errorstr);
       Fail();
       return true;