Просмотр исходного кода

Fix --ignore-depends argument value parsing. Closes: #169125

Frank Lichtenheld лет назад: 20
Родитель
Сommit
a785bc4d5f
3 измененных файлов с 7 добавлено и 3 удалено
  1. 3 0
      ChangeLog
  2. 1 0
      debian/changelog
  3. 3 3
      src/main.c

+ 3 - 0
ChangeLog

@@ -1,5 +1,8 @@
 2006-05-12  Frank Lichtenheld  <djpig@debian.org>
 2006-05-12  Frank Lichtenheld  <djpig@debian.org>
 
 
+	* src/main.c (ignoredepends): Fix parsing of the
+	--ignore-depends argument value.
+
 	* dpkg-deb/info.c (info_spew): Prepend the name of the
 	* dpkg-deb/info.c (info_spew): Prepend the name of the
 	directory we're in to the control component name. This
 	directory we're in to the control component name. This
 	way we don't spew out garbage if we get an absolute
 	way we don't spew out garbage if we get an absolute

+ 1 - 0
debian/changelog

@@ -23,6 +23,7 @@ dpkg (1.13.20~) UNRELEASED; urgency=low
   * Don't spew out garbage from dpkg-deb, if the second argument
   * Don't spew out garbage from dpkg-deb, if the second argument
     to -I is a absolute filename. Based on a patch by Ian Eure.
     to -I is a absolute filename. Based on a patch by Ian Eure.
     Closes: #35573
     Closes: #35573
+  * Fix --ignore-depends argument value parsing. Closes: #169125
 
 
   [ Nicolas François ]
   [ Nicolas François ]
   * fix typos in the Russian man pages. Thanks to Stepan Golosunov.
   * fix typos in the Russian man pages. Thanks to Stepan Golosunov.

+ 3 - 3
src/main.c

@@ -266,11 +266,11 @@ static void ignoredepends(const struct cmdinfo *cip, const char *value) {
   }
   }
   p= copy;
   p= copy;
   while (*p) {
   while (*p) {
-    pnerr= illegal_packagename(value,0);
+    pnerr= illegal_packagename(p,0);
     if (pnerr) ohshite(_("--ignore-depends requires a legal package name. "
     if (pnerr) ohshite(_("--ignore-depends requires a legal package name. "
-                       "`%.250s' is not; %s"), value, pnerr);
+                       "`%.250s' is not; %s"), p, pnerr);
     ni= m_malloc(sizeof(struct packageinlist));
     ni= m_malloc(sizeof(struct packageinlist));
-    ni->pkg= findpackage(value);
+    ni->pkg= findpackage(p);
     ni->next= ignoredependss;
     ni->next= ignoredependss;
     ignoredependss= ni;
     ignoredependss= ni;
     p+= strlen(p)+1;
     p+= strlen(p)+1;