rpm/rpmlint
SHA256
1
0
Fork 0
forked from pool/rpmlint
Code Pull Requests Activity

- add xdg-check-exception.diff:

Browse Source 
handle xdg menu files without exec entry (bnc#833384)

OBS-URL: https://build.opensuse.org/package/show/devel:openSUSE:Factory:rpmlint/rpmlint?expand=0&rev=201
This commit is contained in:
Dirk Mueller 2013-08-06 09:21:50 +00:00 committed by Git OBS Bridge
parent 3061df5327
commit 0596567a6c
3 changed files with 35 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
rpmlint.changes
View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Tue Aug 6 09:21:04 UTC 2013 - dmueller@suse.com
- add xdg-check-exception.diff:
handle xdg menu files without exec entry (bnc#833384)
-------------------------------------------------------------------
Wed Jul 31 11:42:54 UTC 2013 - meissner@suse.com

2
rpmlint.spec
View File

@ -122,6 +122,7 @@ Patch89: suse-python-abi-check.diff
Patch91: suse-manpages-for-rc-scripts.patch
# PATCH-FIX-UPSTREAM: lnussel@suse.de - Fix setgroups error name
Patch92: rpmlint-1.5-Fix-setgroups-error-name.diff
Patch93: xdg-check-exception.diff
%py_requires
@ -198,6 +199,7 @@ source packages can be checked.
%patch89
%patch91 -p1
%patch92 -p1
%patch93 -p1
cp -p %{SOURCE2} .
# Only move top-level python files
chmod 0755 rpmlint-checks-master/*.py

27
xdg-check-exception.diff Normal file
View File

@ -0,0 +1,27 @@
diff --git a/MenuXDGCheck.py b/MenuXDGCheck.py
index 0996585..29085d5 100644
--- a/MenuXDGCheck.py
+++ b/MenuXDGCheck.py
@@ -40,13 +40,16 @@ class MenuXDGCheck(AbstractCheck.AbstractFilesCheck):
printError(pkg, 'non-utf8-desktopfile', filename)
self.cfp.read(f)
- binary = self.cfp.get('Desktop Entry','Exec').split(' ',1)[0]
+ binary = None
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 self.cfp.has_option('Desktop Entry','Exec'):
+ binary = self.cfp.get('Desktop Entry','Exec').split(' ',1)[0]
+
+ 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)