Selaa lähdekoodia

Fix the --force-depends-version option. This closes #57104.

Nicolas FRANCOIS 20 vuotta sitten
vanhempi
commit
c54fb50e3a
3 muutettua tiedostoa jossa 9 lisäystä ja 1 poistoa
  1. 7 0
      ChangeLog
  2. 1 0
      debian/changelog
  3. 1 1
      src/packages.c

+ 7 - 0
ChangeLog

@@ -1,3 +1,10 @@
+2006-05-15  Nicolas François  <nicolas.francois@centraliens.net>
+
+	* 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  <nicolas.francois@centraliens.net>
 
 	* src/configure.c: Flush the terminal's input before

+ 1 - 0
debian/changelog

@@ -40,6 +40,7 @@ dpkg (1.13.20~) UNRELEASED; urgency=low
     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).

+ 1 - 1
src/packages.c

@@ -289,7 +289,7 @@ static int deppossi_ok_found(struct pkginfo *possdependee,
 		   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;