darktemplar/apt
1
0
Fork 0
Code Issues Pull Requests 1 Releases Wiki Activity

Apply apt-0.5.5cnc4.1-alt-PrioComp.patch

Browse Source 
Added in commit e97a90d:
0.5.15lorg2-alt3

- Resolved a few issues introduced after cnc6.
This commit is contained in:
Gleb Fotengauer-Malinovskiy 2014-05-16 21:04:21 +04:00
parent ed26526b06
commit 401a272323
2 changed files with 24 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
apt-0.5.5cnc4.1-alt-PrioComp.patch
View File

@ -1,43 +0,0 @@
diff --git a/apt/apt-pkg/algorithms.cc b/apt/apt-pkg/algorithms.cc
index e8abff2..a5bf5ca 100644
--- a/apt/apt-pkg/algorithms.cc
+++ b/apt/apt-pkg/algorithms.cc
@@ -1402,6 +1402,27 @@ bool pkgProblemResolver::RemoveDepends()
return true;
}
/*}}}*/
+/* Like strcmp, but compares digit sections by number value.
+ * E.g.: tar-1.10 > tar-1.9 > tar-1.1a
+ * (while strcmp gives tar-1.10 < tar-1.9). */
+static int nameCompare(const char* n1, const char* n2)
+{
+ while(*n1 && *n2) {
+ if(isdigit(*n1) && isdigit(*n2)) {
+ unsigned long long i1, i2;
+ i1 = strtoull(n1, const_cast<char **>(&n1), 10);
+ i2 = strtoull(n2, const_cast<char **>(&n2), 10);
+ if(i1 != i2)
+ return (i1 > i2) ? 1 : -1;
+ } else if(*n1 != *n2) {
+ return (*n1 > *n2) ? 1 : -1;
+ } else {
+ n1++;
+ n2++;
+ }
+ }
+ return 0;
+}
// PrioSortList - Sort a list of versions by priority /*{{{*/
// ---------------------------------------------------------------------
@@ -1423,7 +1444,9 @@ static int PrioComp(const void *A,const void *B)
if (L->Priority != R->Priority)
return L->Priority - R->Priority;
- return strcmp(L.ParentPkg().Name(),R.ParentPkg().Name());
+ // PrioComp("gcc2","gcc3") == 1
+ // PrioComp("gcc2", gcc10") == 1
+ return nameCompare(R.ParentPkg().Name(),L.ParentPkg().Name());
}
void pkgPrioSortList(pkgCache &Cache,pkgCache::Version **List)
{

25
apt/apt-pkg/algorithms.cc
View File

@ -1402,6 +1402,27 @@ bool pkgProblemResolver::RemoveDepends()
return true;
}
/*}}}*/
/* Like strcmp, but compares digit sections by number value.
* E.g.: tar-1.10 > tar-1.9 > tar-1.1a
* (while strcmp gives tar-1.10 < tar-1.9). */
static int nameCompare(const char* n1, const char* n2)
{
while(*n1 && *n2) {
if(isdigit(*n1) && isdigit(*n2)) {
unsigned long long i1, i2;
i1 = strtoull(n1, const_cast<char **>(&n1), 10);
i2 = strtoull(n2, const_cast<char **>(&n2), 10);
if(i1 != i2)
return (i1 > i2) ? 1 : -1;
} else if(*n1 != *n2) {
return (*n1 > *n2) ? 1 : -1;
} else {
n1++;
n2++;
}
}
return 0;
}
// PrioSortList - Sort a list of versions by priority /*{{{*/
// ---------------------------------------------------------------------
@ -1423,7 +1444,9 @@ static int PrioComp(const void *A,const void *B)
if (L->Priority != R->Priority)
return L->Priority - R->Priority;
return strcmp(L.ParentPkg().Name(),R.ParentPkg().Name());
// PrioComp("gcc2","gcc3") == 1
// PrioComp("gcc2", gcc10") == 1
return nameCompare(R.ParentPkg().Name(),L.ParentPkg().Name());
}
void pkgPrioSortList(pkgCache &Cache,pkgCache::Version **List)
{