Changeset 1799

Timestamp:

07/12/10 18:13:41 (2 months ago)

Author:

scop

Message:

Choose built in config based on prefix used when invoked (Tom Callaway).

 https://bugzilla.redhat.com/show_bug.cgi?id=537430#c8

Location:

trunk

Files:

• rpmlint.1 (modified) (1 diff)
• rpmlint.py (modified) (2 diffs)

trunk/rpmlint.1

@@ -79 +79 @@
 .SH FILES
 .TP
-\fB/usr/share/rpmlint/config\fR
-Built-in configuration.
+\fB/usr/share/rpmlint/config\fR, \fB/usr/share/rpmlint/config.*\fR
+Built-in configuration.  When invoked as \fIsomeprefix\fR-rpmlint,
+/usr/share/rpmlint/config.\fIsomeprefix\fR is used if it exists,
+otherwise /usr/share/rpmlint/config.
 .TP
 \fB/etc/rpmlint/*config\fR

trunk/rpmlint.py

@@ -15 +15 @@
 import locale
 import os
+import re
 import stat
 import sys
@@ -263 +264 @@
 configs = glob.glob('/etc/rpmlint/*config')
 configs.sort()
-configs.insert(0, '/usr/share/rpmlint/config')
+
+# Was rpmlint invoked as a prefixed variant?
+m = re.match(r"(?P<prefix>[\w-]+)-rpmlint(\.py)?", sys.argv[0])
+if m:
+    # Okay, we're a prefixed variant. Look for the variant config.
+    # If we find it, use it. If not, fallback to the default.
+    prefix = m.group('prefix')
+    if os.path.isfile('/usr/share/rpmlint/config.%s' % prefix):
+        configs.insert(0, '/usr/share/rpmlint/config.%s' % prefix)
+    else:
+        configs.insert(0, '/usr/share/rpmlint/config')
+else:
+    configs.insert(0, '/usr/share/rpmlint/config')
+
 for f in configs:
     try: