[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

[lintian] 02/15: Rename gconftool-used-in-maintainer-script to maintainer-script-should-not-use-gconftool



This is an automated email from the git hooks/post-receive script.

broucaries-guest pushed a commit to branch master
in repository lintian.

commit 16c1c1faa0c9697120f104e7c1577b4e3eb29c3d
Author: Bastien ROUCARIÈS <roucaries.bastien@gmail.com>
Date:   Sat Dec 14 12:46:11 2013 +0100

    Rename gconftool-used-in-maintainer-script to maintainer-script-should-not-use-gconftool
    
    Add gconf\d package to exception list
    
    Signed-off-by: <roucaries.bastien+debian@gmail.com>
---
 checks/scripts.desc                                       | 2 +-
 data/scripts/maintainer-script-bad-command                | 2 +-
 debian/changelog                                          | 3 +++
 t/tests/scripts-maintainer-general/debian/debian/postinst | 2 ++
 t/tests/scripts-maintainer-general/desc                   | 2 +-
 t/tests/scripts-maintainer-general/tags                   | 4 +++-
 6 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/checks/scripts.desc b/checks/scripts.desc
index a3e6eec..9a94efe 100644
--- a/checks/scripts.desc
+++ b/checks/scripts.desc
@@ -514,7 +514,7 @@ Info: This script apparently runs an init script directly rather than
  available.
 Ref: policy 9.3.3.2
 
-Tag: gconftool-used-in-maintainer-script
+Tag: maintainer-script-should-not-use-gconftool
 Severity: normal
 Certainty: possible
 Info: This script apparently runs gconftool or gconftool-2.  It should
diff --git a/data/scripts/maintainer-script-bad-command b/data/scripts/maintainer-script-bad-command
index f829620..3874b24 100644
--- a/data/scripts/maintainer-script-bad-command
+++ b/data/scripts/maintainer-script-bad-command
@@ -24,7 +24,6 @@ ancient-dpkg-epoch-check                            ~~ 0 ~~                    ~
 ancient-dpkg-multi-conrep-check                     ~~ 0 ~~                    ~~                            ~~${LEADIN}dpkg\s+--assert-multi-conrep\b
 deprecated-chown-usage                              ~~ 0 ~~                    ~~                            ~~(chown(?:\s+--?[A-Za-z-]+)*\s+[-_A-Za-z0-9]+\.[-_A-Za-z0-9]+)\s+
 fc-cache-used-in-maintainer-script                  ~~ 0 ~~                    ~~                            ~~${LEADIN}(?:/usr/bin/)?fc-cache(?:\s|\Z)
-gconftool-used-in-maintainer-script                 ~~ 1 ~~                    ~~                            ~~\bgconftool(?:-2)?(?:\s|\Z)
 install-info-used-in-maintainer-script              ~~ 1 ~~                    ~~                            ~~\binstall-info\b
 install-sgmlcatalog-deprecated                      ~~ 1 ~~                    ~~                            ~~\binstall-sgmlcatalog\b
 maintainer-script-hides-init-failure                ~~ 0 ~~                    ~~                            ~~invoke-rc.d.*\|\| \s+ exit \s+ 0
@@ -32,6 +31,7 @@ maintainer-script-modifies-ld-so-conf               ~~ 0 ~~^libc               ~
 maintainer-script-modifies-netbase-managed-file     ~~ 0 ~~                    ~~                            ~~(?:\A\s*(?:cp|mv)\s+.*\s+|>\s*)(/etc/(?:services|protocols|rpc))\s*(?:\s|\Z)
 maintainer-script-removes-device-files              ~~ 0 ~~                    ~~                            ~~^\s*rm\s+(?:[^>]*\s)?(/dev/(?!(?:shm/|\.[^.]+))[^/ ]+)
 maintainer-script-uses-dpkg-status-directly         ~~ 1 ~~^(base-files|dpkg)$ ~~                            ~~/var/lib/dpkg/status\b
+maintainer-script-should-not-use-gconftool          ~~ 1 ~~^(gconf\d)$         ~~                            ~~(?:/usr/bin/)?gconftool(?:-\d)?(?:\s|\Z)
 update-alternatives-remove-called-in-postrm         ~~ 1 ~~                    ~~^postrm$                    ~~\b update\-alternatives\s+\-\-remove\b
 update-alternatives-set-called-in-maintainer-script ~~ 1 ~~                    ~~                            ~~\b update\-alternatives\s+\-\-(?:set|set\-selections|config)\b
 start-stop-daemon-in-maintainer-script              ~~ 0 ~~                    ~~                            ~~\s*start-stop-daemon(?=\s)(?!.*\s--stop\b)
diff --git a/debian/changelog b/debian/changelog
index f09529c..5609611 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -38,6 +38,9 @@ lintian (2.5.20) UNRELEASED; urgency=low
       --home inside /home.  (Closes: #730456).
     + [BR] install-sgmlcatalog is deprecated for a long time.  Warn
       now in all use case.
+    + [BR] Rename gconftool-used-in-maintainer-script to
+      maintainer-script-should-not-use-gconftool.  Add gconf\d package
+      to exception list.
   * checks/standards-version:
     + [BR] Use Lintian::Data for ancient date check.
   * checks/watch.{desc,pm}:
diff --git a/t/tests/scripts-maintainer-general/debian/debian/postinst b/t/tests/scripts-maintainer-general/debian/debian/postinst
index 0279d9c..d2c67c4 100755
--- a/t/tests/scripts-maintainer-general/debian/debian/postinst
+++ b/t/tests/scripts-maintainer-general/debian/debian/postinst
@@ -149,5 +149,7 @@ adduser --system foo
 adduser --system foo2 --home /home/foo2
 adduser --system bar --home /var/lib/bar
 
+# other test case for gconftool
+/usr/bin/gconftool-2 --makefile-install-rule foo.schema
 
 #DEBHELPER#
diff --git a/t/tests/scripts-maintainer-general/desc b/t/tests/scripts-maintainer-general/desc
index c25d891..0bae59e 100644
--- a/t/tests/scripts-maintainer-general/desc
+++ b/t/tests/scripts-maintainer-general/desc
@@ -10,7 +10,6 @@ Test-For:
  command-with-path-in-maintainer-script
  deprecated-chown-usage
  fc-cache-used-in-maintainer-script
- gconftool-used-in-maintainer-script
  install-info-used-in-maintainer-script
  install-sgmlcatalog-deprecated
  maintainer-script-has-unexpanded-debhelper-token
@@ -26,6 +25,7 @@ Test-For:
  maintainer-script-removes-device-files
  maintainer-script-uses-dpkg-status-directly
  maintainer-shell-script-fails-syntax-check
+ maintainer-script-should-not-use-gconftool
  mknod-in-maintainer-script
  possibly-insecure-handling-of-tmp-files-in-maintainer-script
  read-in-maintainer-script
diff --git a/t/tests/scripts-maintainer-general/tags b/t/tests/scripts-maintainer-general/tags
index 035309f..124cca0 100644
--- a/t/tests/scripts-maintainer-general/tags
+++ b/t/tests/scripts-maintainer-general/tags
@@ -17,11 +17,11 @@ E: scripts-maintainer-general: read-in-maintainer-script postinst:10
 E: scripts-maintainer-general: suidregister-used-in-maintainer-script postinst:101
 W: scripts-maintainer-general: command-with-path-in-maintainer-script postinst:117 /usr/bin/foo
 W: scripts-maintainer-general: command-with-path-in-maintainer-script postinst:118 /usr/bin/foo
+W: scripts-maintainer-general: command-with-path-in-maintainer-script postinst:153 /usr/bin/gconftool-2
 W: scripts-maintainer-general: command-with-path-in-maintainer-script postinst:91 /usr/bin/baz
 W: scripts-maintainer-general: deprecated-chown-usage postinst:14 'chown root.root'
 W: scripts-maintainer-general: deprecated-chown-usage postinst:84 'chown -R root.root'
 W: scripts-maintainer-general: fc-cache-used-in-maintainer-script postinst:95
-W: scripts-maintainer-general: gconftool-used-in-maintainer-script postinst:44
 W: scripts-maintainer-general: install-info-used-in-maintainer-script postinst:105
 W: scripts-maintainer-general: maintainer-script-has-unexpanded-debhelper-token postinst
 W: scripts-maintainer-general: maintainer-script-hides-init-failure postinst:31
@@ -30,6 +30,8 @@ W: scripts-maintainer-general: maintainer-script-needs-depends-on-adduser postin
 W: scripts-maintainer-general: maintainer-script-needs-depends-on-gconf2 postinst
 W: scripts-maintainer-general: maintainer-script-needs-depends-on-ucf postinst
 W: scripts-maintainer-general: maintainer-script-needs-depends-on-xml-core postinst
+W: scripts-maintainer-general: maintainer-script-should-not-use-gconftool postinst:153
+W: scripts-maintainer-general: maintainer-script-should-not-use-gconftool postinst:44
 W: scripts-maintainer-general: possibly-insecure-handling-of-tmp-files-in-maintainer-script postinst:26
 W: scripts-maintainer-general: start-stop-daemon-in-maintainer-script postinst:138
 W: scripts-maintainer-general: start-stop-daemon-in-maintainer-script postinst:78

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/lintian/lintian.git


Reply to: