Provide more guarantees against merge catastrophe.

diff --git a/MobileCydia.mm b/MobileCydia.mm
index ce79ef78346eeb87778263f96c47f525c6d96d7c..32c0244145b4801345718845f94ca6d60a5ce542 100644 (file)
--- a/MobileCydia.mm
+++ b/MobileCydia.mm
@@ -3869,7 +3869,7 @@ class CydiaLogCleaner :
         opened = cache_.Open(progress, false);
     _end
     if (!opened) {
         opened = cache_.Open(progress, false);
     _end
     if (!opened) {

-        // XXX: what if there are errors, but Open() == true? this should be merged with popError:
+        // XXX: this block should probably be merged with popError: in some way

         while (!_error->empty()) {
             std::string error;
             bool warning(!_error->PopMessage(error));
         while (!_error->empty()) {
             std::string error;
             bool warning(!_error->PopMessage(error));


@@ -3897,7 +3897,8 @@ class CydiaLogCleaner :
         }
 
         return;
         }
 
         return;

-    }
+    } else if ([self popErrorWithTitle:title forOperation:true])
+        return;

     _trace();
 
     unlink("/tmp/cydia.chk");
     _trace();
 
     unlink("/tmp/cydia.chk");

diff --git a/apt b/apt
index 9fe917c7ea24a626c97fcd9cda39743440a4cbfc..d52f68c8d7e385613076d9ef56af179532139ac8 160000 (submodule)
--- a/apt
+++ b/apt
@@ -1 +1 @@
-Subproject commit 9fe917c7ea24a626c97fcd9cda39743440a4cbfc
+Subproject commit d52f68c8d7e385613076d9ef56af179532139ac8