Author: nekral-guest
Date: 2006-05-16 04:52:46 +0000 (Tue, 16 May 2006)
New Revision: 327
Modified:
trunk/ChangeLog
trunk/debian/changelog
trunk/src/packages.c
Log:
Fix the --force-depends-version option. This closes #57104.
Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog 2006-05-16 04:37:20 UTC (rev 326)
+++ trunk/ChangeLog 2006-05-16 04:52:46 UTC (rev 327)
@@ -1,5 +1,12 @@
2006-05-15 Nicolas François <[EMAIL PROTECTED]>
+ * src/packages.c: Use fc_dependsversion (set by
+ --force-depends-version) when only the version of a
+ dependency is not satisfied. fc_dependsversion is never
+ used otherwise.
+
+2006-05-15 Nicolas François <[EMAIL PROTECTED]>
+
* src/configure.c: Flush the terminal's input before
prompting the user.
Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog 2006-05-16 04:37:20 UTC (rev 326)
+++ trunk/debian/changelog 2006-05-16 04:52:46 UTC (rev 327)
@@ -40,6 +40,7 @@
be printed is empty. Closes: #361671
* flush the terminal's input before prompting what to do with a
configuration file. Closes: #316551
+ * Fix the --force-depends-version option. Closes: #57104
[ Updated dpkg Translations ]
* Portuguese (Miguel Figueiredo).
Modified: trunk/src/packages.c
===================================================================
--- trunk/src/packages.c 2006-05-16 04:37:20 UTC (rev 326)
+++ trunk/src/packages.c 2006-05-16 04:52:46 UTC (rev 327)
@@ -289,7 +289,7 @@
versiondescribe(&possdependee->installed.version,
vdew_nonambig));
assert(checkversion->verrel != dvr_none);
- if (fc_depends) thisf= (dependtry >= 3) ? 2 : 1;
+ if (fc_depends || fc_dependsversion) thisf= (dependtry >= 3) ? 2 : 1;
debug(dbg_depcondetail," bad version, returning %d",thisf);
(*interestingwarnings)++;
return thisf;
--
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]
