The following commit has been merged in the master branch:
commit 8d8de3f2b90b5701d5d48dce50f6c344261ab680
Author: Guillem Jover <[email protected]>
Date: Wed Feb 10 02:21:38 2010 +0100
dselect: Do not shadow display member in packagelist::deselect_one_of
diff --git a/dselect/pkgdepcon.cc b/dselect/pkgdepcon.cc
index 0817b55..48f1029 100644
--- a/dselect/pkgdepcon.cc
+++ b/dselect/pkgdepcon.cc
@@ -156,21 +156,23 @@ static int dep_update_best_to_change_stop(perpackagestate
*& best, pkginfo *tryt
best=trythis->clientdata; return 0;
}
-int packagelist::deselect_one_of(pkginfo *per, pkginfo *ped, dependency
*display) {
+int
+packagelist::deselect_one_of(pkginfo *per, pkginfo *ped, dependency *dep)
+{
perpackagestate *er= per->clientdata;
perpackagestate *ed= ped->clientdata;
if (!er || !would_like_to_install(er->selected,per) ||
!ed || !would_like_to_install(ed->selected,ped)) return 0;
- add(display,dp_must);
+ add(dep, dp_must);
er= per->clientdata; // these can be changed by add
ed= ped->clientdata;
if (depdebug && debug)
fprintf(debug,"packagelist[%p]::deselect_one_of(): er %s{%d} ed %s{%d}
[%p]\n",
- this, er->pkg->name, er->spriority, ed->pkg->name, ed->spriority,
display);
+ this, er->pkg->name, er->spriority, ed->pkg->name, ed->spriority,
dep);
perpackagestate *best;
diff --git a/dselect/pkglist.h b/dselect/pkglist.h
index 6a3a6a9..bb00c8f 100644
--- a/dselect/pkglist.h
+++ b/dselect/pkglist.h
@@ -134,7 +134,7 @@ protected:
int alreadydone(doneent**, void*);
int resolvedepcon(dependency*);
int checkdependers(pkginfo*, int changemade); // returns new changemade
- int deselect_one_of(pkginfo *er, pkginfo *ed, dependency *display);
+ int deselect_one_of(pkginfo *er, pkginfo *ed, dependency *dep);
// Define these virtuals
int checksearch(char* str);
--
dpkg's main repository
--
To UNSUBSCRIBE, email to [email protected]
with a subject of "unsubscribe". Trouble? Contact [email protected]
