Hello community, here is the log from the commit of package rpmlint for openSUSE:Factory checked in at 2013-08-06 12:03:56 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/rpmlint (Old) and /work/SRC/openSUSE:Factory/.rpmlint.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "rpmlint" Changes: -------- --- /work/SRC/openSUSE:Factory/rpmlint/rpmlint.changes 2013-08-01 16:03:24.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.rpmlint.new/rpmlint.changes 2013-08-06 12:41:04.000000000 +0200 @@ -1,0 +2,6 @@ +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) + +------------------------------------------------------------------- New: ---- xdg-check-exception.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ rpmlint.spec ++++++ --- /var/tmp/diff_new_pack.mT9Nin/_old 2013-08-06 12:41:05.000000000 +0200 +++ /var/tmp/diff_new_pack.mT9Nin/_new 2013-08-06 12:41:05.000000000 +0200 @@ -122,6 +122,7 @@ 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 @@ %patch89 %patch91 -p1 %patch92 -p1 +%patch93 -p1 cp -p %{SOURCE2} . # Only move top-level python files chmod 0755 rpmlint-checks-master/*.py ++++++ xdg-check-exception.diff ++++++ 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) -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org