Changeset 1738

Timestamp:

03/06/10 18:51:17 (5 months ago)

Author:

scop

Message:

Fix non-coherent-filename for source packages (regression in r1729).

Files:

• trunk/TagsCheck.py (modified) (1 diff)

trunk/TagsCheck.py

@@ -804 +804 @@
                 i += 1
 
-        expected = pkg.header.sprintf(
-            rpm.expandMacro("%{_build_name_fmt}")).split("/")[-1]
+        expfmt = rpm.expandMacro("%{_build_name_fmt}")
+        if pkg.isSource():
+            # _build_name_fmt often (always?) ends up not outputting src/nosrc
+            # as arch for source packages, do it ourselves
+            expfmt = re.sub(r'(?i)%\{?ARCH\b\}?', pkg.arch, expfmt)
+        expected = pkg.header.sprintf(expfmt).split("/")[-1]
         basename = os.path.basename(pkg.filename)
         if basename != expected: