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

dpkg: Reverse --verify-format logic to accept 'rpm' as valid

Closes: #765907
Guillem Jover лет назад: 11
Родитель
Сommit
17630063de
3 измененных файлов с 6 добавлено и 4 удалено
  1. 2 0
      debian/changelog
  2. 1 1
      src/main.h
  3. 3 3
      src/verify.c

+ 2 - 0
debian/changelog

@@ -11,6 +11,8 @@ dpkg (1.17.19) UNRELEASED; urgency=low
   * Mention --pid and --ppid in start-stop-daemon(8) man page DESCRIPTION.
   * Add invoke hooks for dpkg --add-architecture and --remove-architecture.
     Prompted by Helmut Grohne <helmut@subdivi.de>.
+  * Reverse --verify-format logic to actually accept 'rpm' as valid.
+    Closes: #765907
 
   [ Updated programs translations ]
   * Italian (Milo Casagrande): Closes: #765748

+ 1 - 1
src/main.h

@@ -178,7 +178,7 @@ int cmpversions(const char *const *argv);
 
 /* from verify.c */
 
-int verify_set_output(const char *name);
+bool verify_set_output(const char *name);
 int verify(const char *const *argv);
 
 /* from select.c */

+ 3 - 3
src/verify.c

@@ -81,15 +81,15 @@ verify_output_rpm(struct filenamenode *namenode, struct verify_checks *checks)
 
 static verify_output_func *verify_output = verify_output_rpm;
 
-int
+bool
 verify_set_output(const char *name)
 {
 	if (strcmp(name, "rpm") == 0)
 		verify_output = verify_output_rpm;
 	else
-		return 1;
+		return false;
 
-	return 0;
+	return true;
 }
 
 static void