The following commit has been merged in the master branch: commit 76ef8595442c827dc8682666cd83e054ed8f81e4 Author: Guillem Jover <guil...@debian.org> Date: Tue Jan 31 20:05:49 2012 +0100
dselect: Change debug output to always arch-qualify package names Based-on-patch-by: Raphaƫl Hertzog <hert...@debian.org> Patch-sponsored-by: Linaro Limited Signed-off-by: Guillem Jover <guil...@debian.org> diff --git a/dselect/pkgcmds.cc b/dselect/pkgcmds.cc index cf5f733..275d595 100644 --- a/dselect/pkgcmds.cc +++ b/dselect/pkgcmds.cc @@ -148,7 +148,7 @@ void packagelist::kd_purge() { setwant(pkginfo::want_purge); } int would_like_to_install(pkginfo::pkgwant wantvalue, pkginfo *pkg) { /* Returns: 1 for yes, 0 for no, -1 for if they want to preserve an error condition. */ debug(dbg_general, "would_like_to_install(%d, %s) status %d", - wantvalue, pkg->set->name, pkg->status); + wantvalue, pkg_name(pkg, pnaw_always), pkg->status); if (wantvalue == pkginfo::want_install) return 1; if (wantvalue != pkginfo::want_hold) return 0; diff --git a/dselect/pkgdepcon.cc b/dselect/pkgdepcon.cc index 3408c49..9290dfb 100644 --- a/dselect/pkgdepcon.cc +++ b/dselect/pkgdepcon.cc @@ -52,7 +52,7 @@ packagelist::find_pkgbin(pkginfo *pkg) pkgbin *r; r= useavailable(pkg) ? &pkg->available : &pkg->installed; debug(dbg_general, "packagelist[%p]::find_pkgbin(%s) useavailable=%d", - this, pkg->set->name, useavailable(pkg)); + this, pkgbin_name(pkg, r, pnaw_always), useavailable(pkg)); return r; } @@ -88,7 +88,7 @@ int packagelist::resolvesuggest() { if (!table[index]->pkg->set->name) continue; debug(dbg_depcon, "packagelist[%p]::resolvesuggest() loop[%i] %s / %d", - this, index, table[index]->pkg->set->name, changemade); + this, index, pkg_name(table[index]->pkg, pnaw_always), changemade); dependency *depends; for (depends = find_pkgbin(table[index]->pkg)->depends; depends; @@ -103,7 +103,7 @@ int packagelist::resolvesuggest() { changemade = checkdependers(&depends->list->ed->pkg, changemade); } debug(dbg_depcon, "packagelist[%p]::resolvesuggest() loop[%i] %s / -> %d", - this, index, table[index]->pkg->set->name, changemade); + this, index, pkg_name(table[index]->pkg, pnaw_always), changemade); } if (!changemade) break; maxchangemade = max(maxchangemade, changemade); @@ -118,7 +118,8 @@ static int dep_update_best_to_change_stop(perpackagestate *& best, pkginfo *tryt if (!trythis->clientdata) return 0; debug(dbg_depcon, "update_best_to_change(best=%s{%d}, test=%s{%d});", - best ? best->pkg->set->name : "", best ? (int)best->spriority : -1, + best ? pkg_name(best->pkg, pnaw_always) : "", + best ? (int)best->spriority : -1, trythis->set->name, trythis->clientdata->spriority); // If the problem is caused by us deselecting one of these packages @@ -170,8 +171,8 @@ packagelist::deselect_one_of(pkginfo *per, pkginfo *ped, dependency *dep) debug(dbg_depcon, "packagelist[%p]::deselect_one_of(): er %s{%d} ed %s{%d} [%p]", - this, er->pkg->set->name, er->spriority, - ed->pkg->set->name, ed->spriority, dep); + this, pkg_name(er->pkg, pnaw_always), er->spriority, + pkg_name(ed->pkg, pnaw_always), ed->spriority, dep); perpackagestate *best; @@ -190,7 +191,7 @@ packagelist::deselect_one_of(pkginfo *per, pkginfo *ped, dependency *dep) else best= ed; // ... failing that, the second debug(dbg_depcon, "packagelist[%p]::deselect_one_of(): best %s{%d}", - this, best->pkg->set->name, best->spriority); + this, pkg_name(best->pkg, pnaw_always), best->spriority); if (best->spriority >= sp_deselecting) return 0; best->suggested= @@ -217,7 +218,8 @@ int packagelist::resolvedepcon(dependency *depends) { debug(dbg_depcon, "packagelist[%p]::resolvedepcon([%p] %s --%s-->%s); (ing)->want=%s", - this, depends, depends->up->set->name, relatestrings[depends->type], + this, depends, pkg_name(depends->up, pnaw_always), + relatestrings[depends->type], pkg_names.string(), depends->up->clientdata ? wantstrings[depends->up->clientdata->suggested] : "(no clientdata)"); } @@ -263,7 +265,7 @@ int packagelist::resolvedepcon(dependency *depends) { if (fixbyupgrade) { debug(dbg_depcon, "packagelist[%p]::resolvedepcon([%p]): fixbyupgrade %s", - this, depends, fixbyupgrade->pkg->set->name); + this, depends, pkg_name(fixbyupgrade->pkg, pnaw_always)); best= fixbyupgrade; } else { best= 0; @@ -293,7 +295,7 @@ int packagelist::resolvedepcon(dependency *depends) { } debug(dbg_depcon, "packagelist[%p]::resolvedepcon([%p]): select best=%s{%d}", - this, depends, best->pkg->set->name, best->spriority); + this, depends, pkg_name(best->pkg, pnaw_always), best->spriority); if (best->spriority >= sp_selecting) return r; /* Always select depends. Only select recommends if we got here because * of a manually-initiated install request. */ @@ -307,7 +309,7 @@ int packagelist::resolvedepcon(dependency *depends) { best= depends->up->clientdata; debug(dbg_depcon, "packagelist[%p]::resolvedepcon([%p]): mustdeselect best=%s{%d}", - this, depends, best->pkg->set->name, best->spriority); + this, depends, pkg_name(best->pkg, pnaw_always), best->spriority); if (best->spriority >= sp_deselecting) return r; /* Always remove depends, but never remove recommends. */ diff --git a/dselect/pkglist.cc b/dselect/pkglist.cc index b7fcd58..855c87d 100644 --- a/dselect/pkglist.cc +++ b/dselect/pkglist.cc @@ -178,7 +178,7 @@ void packagelist::ensurestatsortinfo() { if (calcssadone) return; for (index=0; index < nitems; index++) { debug(dbg_general, "packagelist[%p]::ensurestatsortinfos() i=%d pkg=%s", - this, index, table[index]->pkg->set->name); + this, index, pkg_name(table[index]->pkg, pnaw_always)); pkg= table[index]->pkg; switch (pkg->status) { case pkginfo::stat_unpacked: @@ -228,7 +228,7 @@ void packagelist::ensurestatsortinfo() { if (calcsssdone) return; for (index=0; index < nitems; index++) { debug(dbg_general, "packagelist[%p]::ensurestatsortinfos() i=%d pkg=%s", - this, index, table[index]->pkg->set->name); + this, index, pkg_name(table[index]->pkg, pnaw_always)); switch (table[index]->pkg->status) { case pkginfo::stat_unpacked: case pkginfo::stat_halfconfigured: @@ -315,7 +315,7 @@ void packagelist::sortmakeheads() { debug(dbg_general, "packagelist[%p]::sortmakeheads() pkg=%s state=%d avail=%d %s " "priority=%d otherpriority=%s %s section=%s %s", - this, thispkg->set->name, + this, pkg_name(thispkg, pnaw_always), thispkg->clientdata->ssavail, thispkg->clientdata->ssstate, ssdiff ? "*diff" : "same", thispkg->priority, diff --git a/dselect/pkgsublist.cc b/dselect/pkgsublist.cc index ebb0867..ebbc5ef 100644 --- a/dselect/pkgsublist.cc +++ b/dselect/pkgsublist.cc @@ -33,13 +33,14 @@ #include "bindings.h" void packagelist::add(pkginfo *pkg) { - debug(dbg_general, "packagelist[%p]::add(pkginfo %s)", this, pkg->set->name); + debug(dbg_general, "packagelist[%p]::add(pkginfo %s)", + this, pkg_name(pkg, pnaw_always)); if (!recursive || // never add things to top level !pkg->clientdata || // don't add pure virtual packages pkg->clientdata->uprec) // don't add ones already in the recursive list return; debug(dbg_general, "packagelist[%p]::add(pkginfo %s) adding", - this, pkg->set->name); + this, pkg_name(pkg, pnaw_always)); perpackagestate *state= &datatable[nitems]; state->pkg= pkg; state->direct= state->original= pkg->clientdata->selected; @@ -54,21 +55,21 @@ void packagelist::add(pkginfo *pkg) { void packagelist::add(pkginfo *pkg, pkginfo::pkgwant nw) { debug(dbg_general, "packagelist[%p]::add(pkginfo %s, %s)", - this, pkg->set->name, wantstrings[nw]); + this, pkg_name(pkg, pnaw_always), wantstrings[nw]); add(pkg); if (!pkg->clientdata) return; pkg->clientdata->direct= nw; selpriority np; np= would_like_to_install(nw,pkg) ? sp_selecting : sp_deselecting; if (pkg->clientdata->spriority > np) return; debug(dbg_general, "packagelist[%p]::add(pkginfo %s, %s) setting", - this, pkg->set->name, wantstrings[nw]); + this, pkg_name(pkg, pnaw_always), wantstrings[nw]); pkg->clientdata->suggested= pkg->clientdata->selected= nw; pkg->clientdata->spriority= np; } void packagelist::add(pkginfo *pkg, const char *extrainfo, showpriority showimp) { debug(dbg_general, "packagelist[%p]::add(pkginfo %s, ..., showpriority %d)", - this, pkg->set->name, showimp); + this, pkg_name(pkg, pnaw_always), showimp); add(pkg); if (!pkg->clientdata) return; if (pkg->clientdata->dpriority < showimp) pkg->clientdata->dpriority= showimp; pkg->clientdata->relations(extrainfo); -- dpkg's main repository -- To UNSUBSCRIBE, email to debian-dpkg-cvs-requ...@lists.debian.org with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org