[Lsb-messages] /var/www/bzr/lsb/devel/misc-test r2285: Fix issue with pkgchk not looking for "lsb" requires for noarch pkg (bug 3215)

Stew Benedict stewb at linux-foundation.org
Thu May 24 15:30:17 UTC 2012


------------------------------------------------------------
revno: 2285
committer: Stew Benedict <stewb at linux-foundation.org>
branch nick: misc-test
timestamp: Thu 2012-05-24 11:30:17 -0400
message:
  Fix issue with pkgchk not looking for "lsb" requires for noarch pkg (bug 3215)
modified:
  package/Makefile
  rpmchk/dependencies.c
-------------- next part --------------
=== modified file 'package/Makefile'
--- a/package/Makefile	2012-03-23 16:53:40 +0000
+++ b/package/Makefile	2012-05-24 15:30:17 +0000
@@ -9,7 +9,7 @@
 
 # Supply default LSBVERSION - target spec version.
 # a big second number (80-99) is leading up to next major spec
-LSBVERSION=4.80
+LSBVERSION=4.81
 # Get value of RPM_PACKAGE_VERSION from LSBVERSION.
 RPM_PACKAGE_VERSION=$(LSBVERSION)
 

=== modified file 'rpmchk/dependencies.c'
--- a/rpmchk/dependencies.c	2010-09-10 14:51:20 +0000
+++ b/rpmchk/dependencies.c	2012-05-24 15:30:17 +0000
@@ -132,17 +132,18 @@
 				   tetj_tp_count, 0, 0, 0, tmp_string);
 	    }
 	}
-    } else {
-	for (d = 0; d < numalldeps; d++) {
-	    if (alldeps[d].isrequired && !alldeps[d].seenit) {
-		snprintf(tmp_string, TMP_STRING_SIZE,
-			 "Didn't see expected dependency %s=%s",
-			 alldeps[d].reqname, alldeps[d].reqversion);
-		fprintf(stderr, "Error: %s\n", tmp_string);
-		fail = TETJ_FAIL;
-		tetj_testcase_info(journal, tetj_activity_count,
-				   tetj_tp_count, 0, 0, 0, tmp_string);
-	    }
+    }
+
+    /* even so, noarch packages still should have a plain "lsb" require */
+    for (d = 0; d < numalldeps; d++) {
+	if (alldeps[d].isrequired && !alldeps[d].seenit) {
+ 	    snprintf(tmp_string, TMP_STRING_SIZE,
+		     "Didn't see expected dependency %s=%s",
+		     alldeps[d].reqname, alldeps[d].reqversion);
+	    fprintf(stderr, "Error: %s\n", tmp_string);
+	    fail = TETJ_FAIL;
+	    tetj_testcase_info(journal, tetj_activity_count,
+	    		       tetj_tp_count, 0, 0, 0, tmp_string);
 	}
     }
 



More information about the lsb-messages mailing list