From: Jay Freeman (saurik) Date: Thu, 2 Jul 2015 15:25:46 +0000 (-0700) Subject: Don't inject sources.list if cydia.list is linked. X-Git-Tag: v1.1.19~10 X-Git-Url: https://git.saurik.com/cydia.git/commitdiff_plain/93524d32b3c75083549e3871dcd10db30c94283d?ds=inline Don't inject sources.list if cydia.list is linked. --- diff --git a/MobileCydia.mm b/MobileCydia.mm index a636eeb5..75d28421 100644 --- a/MobileCydia.mm +++ b/MobileCydia.mm @@ -3743,11 +3743,23 @@ class CydiaLogCleaner : return [self popErrorWithTitle:title] || !success; } +- (bool) _isEtceteraAptSourcesListDirectoryCydiaListSymbolicallyLinkedToMobileCachesCydiaSourceList { + char target[1024]; + ssize_t length(readlink("/etc/apt/sources.list.d/cydia.list", target, sizeof(target) - 1)); + if (length == -1) + return false; + if (length >= sizeof(target)) + return false; + target[length] = '\0'; + return strcmp(target, "/var/mobile/Library/Caches/com.saurik.Cydia/sources.list") == 0; +} + - (bool) popErrorWithTitle:(NSString *)title forReadList:(pkgSourceList &)list { if ([self popErrorWithTitle:title forOperation:list.ReadMainList()]) return true; - if ([self popErrorWithTitle:title forOperation:list.Read(SOURCES_LIST)]) - return true; + if (![self _isEtceteraAptSourcesListDirectoryCydiaListSymbolicallyLinkedToMobileCachesCydiaSourceList]) + if ([self popErrorWithTitle:title forOperation:list.Read(SOURCES_LIST)]) + return true; return false; }