From: Jay Freeman (saurik) <saurik@saurik.com>
Date: Fri, 30 Dec 2016 22:11:05 +0000 (-0800)
Subject: Provide more guarantees against merge catastrophe.
X-Git-Tag: v1.1.28%b4^0
X-Git-Url: https://git.saurik.com/cydia.git/commitdiff_plain/fec09a82a82c55ef19723940d96cb15e15fc4ed2?ds=sidebyside

Provide more guarantees against merge catastrophe.
---

diff --git a/MobileCydia.mm b/MobileCydia.mm
index ce79ef78..32c02441 100644
--- a/MobileCydia.mm
+++ b/MobileCydia.mm
@@ -3869,7 +3869,7 @@ class CydiaLogCleaner :
         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));
@@ -3897,7 +3897,8 @@ class CydiaLogCleaner :
         }
 
         return;
-    }
+    } else if ([self popErrorWithTitle:title forOperation:true])
+        return;
     _trace();
 
     unlink("/tmp/cydia.chk");
diff --git a/apt b/apt
index 9fe917c7..d52f68c8 160000
--- a/apt
+++ b/apt
@@ -1 +1 @@
-Subproject commit 9fe917c7ea24a626c97fcd9cda39743440a4cbfc
+Subproject commit d52f68c8d7e385613076d9ef56af179532139ac8