The following commit has been merged in the master branch:
commit 4bd14c490b63e58798108969ac3a5a1aa2fa04f3
Author: Guillem Jover <[email protected]>
Date: Tue Jul 14 12:51:40 2009 +0200
dselect: Fix typo in package deselection condition
The test was always false due to the typo.
diff --git a/debian/changelog b/debian/changelog
index 1f09b1c..92b3d9d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -21,6 +21,8 @@ dpkg (1.15.4) UNRELEASED; urgency=low
package name on “dpkg-deb -b”. Closes: #218018, #373602
* Remove obsolete ‘hold’ and ‘hold-reinstreq’ internal status flags.
* Add fakeroot to dpkg-dev Recommends. Closes: #536821
+ * Fix an always false test when trying to decide which package to deselect
+ to resolve a dependency problem in dselect.
[ Raphael Hertzog ]
* Replace install-info by a wrapper around GNU's install-info. The wrapper
diff --git a/dselect/pkgdepcon.cc b/dselect/pkgdepcon.cc
index 5627f96..64e6651 100644
--- a/dselect/pkgdepcon.cc
+++ b/dselect/pkgdepcon.cc
@@ -182,11 +182,11 @@ int packagelist::deselect_one_of(pkginfo *per, pkginfo
*ped, dependency *display
best = er;
else if (er->spriority < ed->spriority) best= er; // We'd rather change the
else if (er->spriority > ed->spriority) best= ed; // one with the lowest
priority.
- else if (er->pkg->priority >
- er->pkg->priority) best= er; // ... failing that the one
with
- else if (er->pkg->priority < // the highest priority
- er->pkg->priority) best= ed;
-
+ // ... failing that the one with the highest priority
+ else if (er->pkg->priority > ed->pkg->priority)
+ best = er;
+ else if (er->pkg->priority < ed->pkg->priority)
+ best = ed;
else best= ed; // ... failing that, the
second
if (depdebug && debug)
--
dpkg's main repository
--
To UNSUBSCRIBE, email to [email protected]
with a subject of "unsubscribe". Trouble? Contact [email protected]
