Fixed queuing and the iphone-gcc crash.

diff --git a/Cydia.app/confirm.js b/Cydia.app/confirm.js
index bd78c2e5da8022c714853809218b3ed5c1927a42..ba2e2e5d9a2807eb73923f5f39e6e59352a4f8a4 100644 (file)
--- a/Cydia.app/confirm.js
+++ b/Cydia.app/confirm.js
@@ -43,9 +43,12 @@ $(function () {
             var type = entry[0];
             if (type == "PreDepends")
                 type = "Depends";
             var type = entry[0];
             if (type == "PreDepends")
                 type = "Depends";

+            var version = entry[1];
+            if (entry.length >= 4)
+                version += " " + entry[3];

             $("#i" + i).append("<div class=\"clearfix\"><div>" +
                 "<label>" + $.xml(type) + "</label>" +
             $("#i" + i).append("<div class=\"clearfix\"><div>" +
                 "<label>" + $.xml(type) + "</label>" +

-                "<label>" + $.xml(entry[1] + " " + entry[3]) + "</label>" +
+                "<label>" + $.xml(version) + "</label>" +

             "</div></div>");
         }
     }
             "</div></div>");
         }
     }

diff --git a/Cydia.mm b/Cydia.mm
index 56eb097934607711136422a132f6126fc73fcad4..88c7481f29030c63121c781f093226ec958460d7 100644 (file)
--- a/Cydia.mm
+++ b/Cydia.mm
@@ -418,7 +418,7 @@ static const CFStringCompareFlags LaxCompareFlags_ = kCFCompareCaseInsensitive |
 #define IgnoreInstall (0 && !ForRelease)
 #define RecycleWebViews 0
 #define RecyclePackageViews 1
 #define IgnoreInstall (0 && !ForRelease)
 #define RecycleWebViews 0
 #define RecyclePackageViews 1

-#define AlwaysReload (1 && !ForRelease)
+#define AlwaysReload (0 && !ForRelease)

 
 #if !TraceLogging
 #undef _trace
 
 #if !TraceLogging
 #undef _trace


@@ -2458,12 +2458,9 @@ struct PackageNameOrdering :
 
 - (Address *) author {
     if (author$_ == nil) {
 
 - (Address *) author {
     if (author$_ == nil) {

-_trace();

         if (author_.empty())
             return nil;
         if (author_.empty())
             return nil;

-_trace();

         author$_ = [[Address addressWithString:author_] retain];
         author$_ = [[Address addressWithString:author_] retain];

-_trace();

     } return author$_;
 }
 
     } return author$_;
 }
 


@@ -3115,8 +3112,10 @@ static NSArray *Finishes_;
             [entry addObject:failure];
             [failure addObject:[NSString stringWithUTF8String:start.DepType()]];
 
             [entry addObject:failure];
             [failure addObject:[NSString stringWithUTF8String:start.DepType()]];
 

-            Package *package([self packageWithName:[NSString stringWithUTF8String:start.TargetPkg().Name()]]);
-            [failure addObject:[package name]];
+            NSString *name([NSString stringWithUTF8String:start.TargetPkg().Name()]);
+            if (Package *package = [self packageWithName:name])
+                name = [package name];
+            [failure addObject:name];

 
             pkgCache::PkgIterator target(start.TargetPkg());
             if (target->ProvidesList != 0)
 
             pkgCache::PkgIterator target(start.TargetPkg());
             if (target->ProvidesList != 0)


@@ -3322,6 +3321,8 @@ static NSArray *Finishes_;
 }
 
 - (void) prepare {
 }
 
 - (void) prepare {

+    fetcher_->Shutdown();
+

     pkgRecords records(cache_);
 
     lock_ = new FileFd();
     pkgRecords records(cache_);
 
     lock_ = new FileFd();