[rpmlint] Do not throw an error on desktop files set +x

Tom Callaway spot at fedoraproject.org
Thu Dec 15 19:25:46 UTC 2011


commit 364c6fdefd54fc899855d4b35522a0fe11216e89
Author: Tom Callaway <spot at fedoraproject.org>
Date:   Thu Dec 15 14:25:38 2011 -0500

    Do not throw an error on desktop files set +x

 rpmlint.config |    4 ++++
 rpmlint.spec   |    5 ++++-
 2 files changed, 8 insertions(+), 1 deletions(-)
---
diff --git a/rpmlint.config b/rpmlint.config
index 05ca3c9..f2e9c0f 100644
--- a/rpmlint.config
+++ b/rpmlint.config
@@ -367,6 +367,10 @@ addFilter("files-attr-not-set")
 # since they have tmpfs /var/lock and /var/run.
 addFilter("non-ghost-in-var-lock") 
 addFilter("non-ghost-in-var-run")
+# Someone thought it was a good idea to make .desktop files executable. They were wrong.
+# Nevertheless, I do not yet control the universe, so we squelch the error here.
+addFilter("script-without-shebang .*\.desktop$")
+
 # https://bugzilla.redhat.com/496737, https://bugzilla.redhat.com/646455
 for pkg, exe in (("coreutils", "/bin/su"),
                  ("krb5-workstation", "/usr/kerberos/bin/ksu"),
diff --git a/rpmlint.spec b/rpmlint.spec
index c473aea..fbccada 100644
--- a/rpmlint.spec
+++ b/rpmlint.spec
@@ -1,6 +1,6 @@
 Name:           rpmlint
 Version:        1.4
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Tool for checking common errors in RPM packages
 
 Group:          Development/Tools
@@ -86,6 +86,9 @@ make check
 
 
 %changelog
+* Thu Dec 15 2011 Tom Callaway <spot at fedoraproject.org> - 1.4-4
+- Do not throw an error on .desktop files set +x. (bz 767878)
+
 * Mon Dec  5 2011 Tom Callaway <spot at fedoraproject.org> - 1.4-3
 - own %%{_datadir}/bash-completion/ (thanks Ville Skyttä)
 


More information about the scm-commits mailing list