[rpmlint/f18] update license list, fix desktop file parsing
Tom Callaway
spot at fedoraproject.org
Wed Oct 9 23:41:35 UTC 2013
commit d41aaaebc17caf27ed4b4a6704c20aac32b1ce79
Author: Tom Callaway <spot at fedoraproject.org>
Date: Wed Oct 9 19:42:17 2013 -0400
update license list, fix desktop file parsing
rpmlint-1.5-desktopfix.patch | 31 +++++++++++++++++++++++++++++++
1 files changed, 31 insertions(+), 0 deletions(-)
---
diff --git a/rpmlint-1.5-desktopfix.patch b/rpmlint-1.5-desktopfix.patch
new file mode 100644
index 0000000..891ee62
--- /dev/null
+++ b/rpmlint-1.5-desktopfix.patch
@@ -0,0 +1,31 @@
+diff -up rpmlint-1.5/MenuXDGCheck.py.desktopfix rpmlint-1.5/MenuXDGCheck.py
+--- rpmlint-1.5/MenuXDGCheck.py.desktopfix 2013-10-09 19:33:21.067330420 -0400
++++ rpmlint-1.5/MenuXDGCheck.py 2013-10-09 19:33:50.422330861 -0400
+@@ -41,14 +41,19 @@ class MenuXDGCheck(AbstractCheck.Abstrac
+
+ self.cfp.read(f)
+ binary = self.cfp.get('Desktop Entry','Exec').split(' ',1)[0]
+- found = False
+- for i in STANDARD_BIN_DIRS:
+- if os.path.exists(root + i + binary):
+- # no need to check if the binary is +x, rpmlint does it
+- # in another place
+- found = True
+- if not found and binary:
+- printWarning(pkg, 'desktopfile-without-binary', filename, binary)
++ if binary:
++ if binary.startswith('/'):
++ found = os.path.exists(root + binary)
++ else:
++ for i in STANDARD_BIN_DIRS:
++ if os.path.exists(root + i + binary):
++ # no need to check if the binary is +x, rpmlint does it
++ # in another place
++ found = True
++ break
++ if not found:
++ printWarning(pkg, 'desktopfile-without-binary', filename,
++ binary)
+
+ check = MenuXDGCheck()
+
More information about the scm-commits
mailing list