4209b47a2a
Copy from Base:System/rpmlint-mini based on submit request 19020 from user lnussel OBS-URL: https://build.opensuse.org/request/show/19020 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/rpmlint-mini?expand=0&rev=25
72 lines
2.1 KiB
Diff
72 lines
2.1 KiB
Diff
Index: Config.py
|
|
===================================================================
|
|
--- Config.py.orig
|
|
+++ Config.py
|
|
@@ -75,7 +75,7 @@ def resetChecks():
|
|
|
|
# handle the list of directories to look for checks
|
|
|
|
-_dirs = ["/usr/share/rpmlint"]
|
|
+_dirs = ["/opt/testing/share/rpmlint"]
|
|
|
|
def addCheckDir(dir):
|
|
global _dirs
|
|
Index: rpmlint.py
|
|
===================================================================
|
|
--- rpmlint.py.orig
|
|
+++ rpmlint.py
|
|
@@ -226,7 +226,7 @@ except getopt.error, e:
|
|
sys.exit(1)
|
|
|
|
# process options
|
|
-checkdir = '/usr/share/rpmlint'
|
|
+checkdir='/opt/testing/share/rpmlint'
|
|
checks = []
|
|
verbose = 0
|
|
extract_dir = None
|
|
@@ -237,7 +237,7 @@ info_error = 0
|
|
# load global config files
|
|
configs = glob.glob('/etc/rpmlint/*config')
|
|
configs.sort()
|
|
-configs.insert(0, '/usr/share/rpmlint/config')
|
|
+configs.insert(0, '/opt/testing/share/rpmlint/config')
|
|
for f in configs:
|
|
try:
|
|
execfile(f)
|
|
@@ -279,12 +279,16 @@ for o in opt:
|
|
print 'unknown option', o
|
|
|
|
# load user config file
|
|
-try:
|
|
- execfile(os.path.expanduser(conf_file))
|
|
-except IOError:
|
|
- pass
|
|
-except Exception,E:
|
|
- sys.stderr.write('(none): W: error loading %s, skipping: %s\n' % (conf_file, E))
|
|
+userlist = glob.glob("/usr/src/packages/SOURCES/*rpmlintrc")
|
|
+userlist.insert(0, os.path.expanduser(conf_file))
|
|
+
|
|
+for f in userlist:
|
|
+ try:
|
|
+ execfile(f)
|
|
+ except IOError:
|
|
+ pass
|
|
+ except Exception,E:
|
|
+ sys.stderr.write('(none): W: error loading %s, skipping: %s\n' % (conf_file, E))
|
|
|
|
if not extract_dir:
|
|
extract_dir = Config.getOption('ExtractDir', tempfile.gettempdir())
|
|
Index: MenuXDGCheck.py
|
|
===================================================================
|
|
--- MenuXDGCheck.py.orig
|
|
+++ MenuXDGCheck.py
|
|
@@ -22,7 +22,7 @@ class MenuXDGCheck(AbstractCheck.Abstrac
|
|
|
|
def check_file(self, pkg, filename):
|
|
f = pkg.dirName() + filename
|
|
- st = getstatusoutput(('desktop-file-validate', f), 1)
|
|
+ st = getstatusoutput(('/opt/testing/bin/desktop-file-validate', f), 1)
|
|
if st[0]:
|
|
if st[1].find('error:') != -1:
|
|
printError(pkg, 'invalid-desktopfile', filename, st[1].split('error: ')[1])
|