[Piuparts-commits] [SCM] piuparts git repository branch, master, updated. 0.51

David Steele dsteele at gmail.com
Wed May 15 10:09:53 UTC 2013 

The following commit has been merged in the master branch:
commit 6a775e71c52a1733b439442a0d457f3764cc5545
Author: David Steele <dsteele at gmail.com>
Date:   Wed Apr 17 20:45:04 2013 -0400

    Change known_problem INCLUDE and EXCLUDE to PATTERN and EXCLUDE_PATTERN.

diff --git a/debian/changelog b/debian/changelog
index 19c3f68..650608e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -63,8 +63,9 @@ piuparts (0.51) UNRELEASED; urgency=low
       separating bugged from everything else.
       (Closes: #698526)
     - Add a PTS link to issue and error summary entries.
-    - Replace the known_problem COMMAND with INCLUDE and EXCLUDE, and replace
-      grep shell calls with python re modules calls, for a 10x speedup.
+    - Replace the known_problem COMMAND with PATTERN and EXCLUDE_PATTERN,
+      and replace grep shell calls with python re modules calls, for a
+      10x speedup.
     - Minor HTML syntax fix.
     - Minor template integration.
 
diff --git a/known_problems/alternatives_after_purge_error.conf b/known_problems/alternatives_after_purge_error.conf
index 52ba698..e839936 100644
--- a/known_problems/alternatives_after_purge_error.conf
+++ b/known_problems/alternatives_after_purge_error.conf
@@ -1,7 +1,7 @@
 #
 # detect packages with unowned files in /etc/alternatives after purge (policy 6.8)
 #
-INCLUDE='/etc/alternatives/.*not owned'
+PATTERN='/etc/alternatives/.*not owned'
 WHERE='fail bugged affected'
 ISSUE=0
 HEADER='Packages with leftover alternatives after purge'
diff --git a/known_problems/alternatives_after_purge_issue.conf b/known_problems/alternatives_after_purge_issue.conf
index 6e57f7f..6b6d57e 100644
--- a/known_problems/alternatives_after_purge_issue.conf
+++ b/known_problems/alternatives_after_purge_issue.conf
@@ -1,7 +1,7 @@
 #
 # detect packages with unowned files in /etc/alternatives after purge (policy 6.8)
 #
-INCLUDE='/etc/alternatives/.*not owned'
+PATTERN='/etc/alternatives/.*not owned'
 WHERE='pass'
 ISSUE=1
 HEADER='Packages with leftover alternatives after purge'
diff --git a/known_problems/broken_symlinks_error.conf b/known_problems/broken_symlinks_error.conf
index 456f9f9..6eed078 100644
--- a/known_problems/broken_symlinks_error.conf
+++ b/known_problems/broken_symlinks_error.conf
@@ -1,7 +1,7 @@
 #
 # detect packages which have the string "Broken symlinks" in their logs
 #
-INCLUDE='(WARN|FAIL): Broken symlink'
+PATTERN='(WARN|FAIL): Broken symlink'
 WHERE='fail bugged affected'
 ISSUE=1
 HEADER='Packages which have logs with the string "Broken symlinks"'
diff --git a/known_problems/broken_symlinks_issue.conf b/known_problems/broken_symlinks_issue.conf
index d36aa0b..52607f8 100644
--- a/known_problems/broken_symlinks_issue.conf
+++ b/known_problems/broken_symlinks_issue.conf
@@ -1,7 +1,7 @@
 #
 # detect packages which have the string "Broken symlinks" in their logs
 #
-INCLUDE='(WARN|FAIL): Broken symlink'
+PATTERN='(WARN|FAIL): Broken symlink'
 WHERE='pass'
 ISSUE=1
 HEADER='Packages which have logs with the string "Broken symlinks"'
diff --git a/known_problems/command_not_found_error.conf b/known_problems/command_not_found_error.conf
index bf50587..1372e4c 100644
--- a/known_problems/command_not_found_error.conf
+++ b/known_problems/command_not_found_error.conf
@@ -1,7 +1,7 @@
 #
 # detect packages with miss a depends or use non-essential in purge
 #
-INCLUDE='command not found|: not found'
+PATTERN='command not found|: not found'
 WHERE='fail bugged affected'
 ISSUE=0
 HEADER='Packages with failed logs with the string "command not found"'
diff --git a/known_problems/command_not_found_issue.conf b/known_problems/command_not_found_issue.conf
index 095b8ca..aaf8ae6 100644
--- a/known_problems/command_not_found_issue.conf
+++ b/known_problems/command_not_found_issue.conf
@@ -1,7 +1,7 @@
 #
 # detect packages which passed the piuparts test but have the string "command not found" in their logs
 #
-INCLUDE='command not found|: not found'
+PATTERN='command not found|: not found'
 WHERE='pass'
 ISSUE=1
 HEADER='Packages which passed the piuparts test but have logs with the string "command not found"'
diff --git a/known_problems/conffile_prompt_error.conf b/known_problems/conffile_prompt_error.conf
index ebe3b36..441c7ab 100644
--- a/known_problems/conffile_prompt_error.conf
+++ b/known_problems/conffile_prompt_error.conf
@@ -1,7 +1,7 @@
 #
 # detect packages with failed because they prompt due to a modified conffile
 #
-INCLUDE='EOF on stdin at conffile prompt'
+PATTERN='EOF on stdin at conffile prompt'
 WHERE='fail bugged affected'
 ISSUE=0
 HEADER='Packages with failed logs with the string "EOF on stdin at conffile prompt"'
diff --git a/known_problems/cron_error_after_removal_error.conf b/known_problems/cron_error_after_removal_error.conf
index f7fbb2d..cfc4d03 100644
--- a/known_problems/cron_error_after_removal_error.conf
+++ b/known_problems/cron_error_after_removal_error.conf
@@ -1,7 +1,7 @@
 #
 # detect packages with cron errors after the package has been removed
 #
-INCLUDE='(FAIL: Cron file .* has output with package removed|ERROR: Command failed.*./etc/cron\..*/.*.])'
+PATTERN='(FAIL: Cron file .* has output with package removed|ERROR: Command failed.*./etc/cron\..*/.*.])'
 WHERE='fail bugged affected'
 ISSUE=0
 HEADER='Packages with failed logs because a cron file has output and/or exits with error after the package has been removed'
diff --git a/known_problems/db_setup_error.conf b/known_problems/db_setup_error.conf
index b192939..1020cd6 100644
--- a/known_problems/db_setup_error.conf
+++ b/known_problems/db_setup_error.conf
@@ -1,7 +1,7 @@
 #
 # detect packages with failed to install due to problems configuring the db - see #595652
 #
-INCLUDE='(warning: database package not installed|dbconfig-common: .* configure: (aborted|noninteractive fail).|updating database schema for .*...command failed with code 0|psql: could not connect to server: No such file or directory|DBI connect.* failed: could not connect to server|pg_pconnect\(\): Unable to connect to PostgreSQL server|Unable to connect to MySQL server|unable to connect to mysql server)'
+PATTERN='(warning: database package not installed|dbconfig-common: .* configure: (aborted|noninteractive fail).|updating database schema for .*...command failed with code 0|psql: could not connect to server: No such file or directory|DBI connect.* failed: could not connect to server|pg_pconnect\(\): Unable to connect to PostgreSQL server|Unable to connect to MySQL server|unable to connect to mysql server)'
 WHERE='fail bugged affected'
 ISSUE=0
 HEADER='Packages with failed logs because installation failed because no database could be connected.'
diff --git a/known_problems/db_setup_issue.conf b/known_problems/db_setup_issue.conf
index c02309e..e13ac74 100644
--- a/known_problems/db_setup_issue.conf
+++ b/known_problems/db_setup_issue.conf
@@ -1,7 +1,7 @@
 #
 # detect packages with failed to install due to problems configuring the db - see #595652
 #
-INCLUDE='(warning: database package not installed|dbconfig-common: .* configure: (aborted|noninteractive fail).|updating database schema for .*...command failed with code 0|psql: could not connect to server: No such file or directory|DBI connect.* failed: could not connect to server|pg_pconnect\(\): Unable to connect to PostgreSQL server|Unable to connect to MySQL server|unable to connect to mysql server)'
+PATTERN='(warning: database package not installed|dbconfig-common: .* configure: (aborted|noninteractive fail).|updating database schema for .*...command failed with code 0|psql: could not connect to server: No such file or directory|DBI connect.* failed: could not connect to server|pg_pconnect\(\): Unable to connect to PostgreSQL server|Unable to connect to MySQL server|unable to connect to mysql server)'
 WHERE='pass'
 ISSUE=1
 HEADER='Packages with failed logs because installation failed because no database could be connected.'
diff --git a/known_problems/debsums_mismatch_error.conf b/known_problems/debsums_mismatch_error.conf
index cf43575..f39dd12 100644
--- a/known_problems/debsums_mismatch_error.conf
+++ b/known_problems/debsums_mismatch_error.conf
@@ -1,7 +1,7 @@
 #
 # detect packages which modify shipped files
 #
-INCLUDE='FAIL: debsums reports modifications inside the chroot'
+PATTERN='FAIL: debsums reports modifications inside the chroot'
 WHERE='fail bugged affected'
 ISSUE=0
 HEADER='Packages with modified files before removal'
diff --git a/known_problems/debsums_mismatch_issue.conf b/known_problems/debsums_mismatch_issue.conf
index 4688046..d5b5f01 100644
--- a/known_problems/debsums_mismatch_issue.conf
+++ b/known_problems/debsums_mismatch_issue.conf
@@ -1,7 +1,7 @@
 #
 # detect packages which modify shipped files
 #
-INCLUDE='FAIL: debsums reports modifications inside the chroot'
+PATTERN='FAIL: debsums reports modifications inside the chroot'
 WHERE='pass'
 ISSUE=1
 HEADER='Packages with modified files before removal'
diff --git a/known_problems/dependency_error.conf b/known_problems/dependency_error.conf
index 33f5c2f..c512ca3 100644
--- a/known_problems/dependency_error.conf
+++ b/known_problems/dependency_error.conf
@@ -1,7 +1,7 @@
 #
 # detect packages with unsatisfied dependencies
 #
-INCLUDE='E: Broken packages|E: Unable to correct problems, you have held broken packages.|E: Error, pkgProblemResolver::Resolve generated breaks, this may be caused by held packages.'
+PATTERN='E: Broken packages|E: Unable to correct problems, you have held broken packages.|E: Error, pkgProblemResolver::Resolve generated breaks, this may be caused by held packages.'
 WHERE='fail bugged affected'
 ISSUE=0
 HEADER='Packages with failed logs because of unsatisfied dependencies'
diff --git a/known_problems/disappeared_files_after_purge_error.conf b/known_problems/disappeared_files_after_purge_error.conf
index 29ea353..0680673 100644
--- a/known_problems/disappeared_files_after_purge_error.conf
+++ b/known_problems/disappeared_files_after_purge_error.conf
@@ -1,8 +1,8 @@
 #
 # detect packages with disappeared files after purge
 #
-INCLUDE='FAIL: After purging files have disappeared:'
-EXCLUDE=',|usr/local'
+PATTERN='FAIL: After purging files have disappeared:'
+EXCLUDE_PATTERN=',|usr/local'
 WHERE='fail bugged affected'
 ISSUE=0
 HEADER='Packages with files which disappeared after purge'
diff --git a/known_problems/diversion_error.conf b/known_problems/diversion_error.conf
index ec882a0..335d632 100644
--- a/known_problems/diversion_error.conf
+++ b/known_problems/diversion_error.conf
@@ -1,7 +1,7 @@
 #
 # detect packages which mishandle diversions
 #
-INCLUDE='ERROR: FAIL: (Existing|Installed) diversions'
+PATTERN='ERROR: FAIL: (Existing|Installed) diversions'
 WHERE='fail bugged affected'
 ISSUE=0
 HEADER='Packages that leave a modified diversion state'
diff --git a/known_problems/files_in_usr_local_error.conf b/known_problems/files_in_usr_local_error.conf
index a34ca21..92dad48 100644
--- a/known_problems/files_in_usr_local_error.conf
+++ b/known_problems/files_in_usr_local_error.conf
@@ -1,7 +1,7 @@
 #
 # detect packages which leave stuff in /usr/local (see policy 9.1.2)
 #
-INCLUDE='usr/local.+not owned'
+PATTERN='usr/local.+not owned'
 WHERE='fail bugged affected'
 ISSUE=0
 HEADER='Packages with files and/or directories in /usr/local/ after purge'
diff --git a/known_problems/initdscript_lsb_header_issue.conf b/known_problems/initdscript_lsb_header_issue.conf
index 72fd9d6..8e64da1 100644
--- a/known_problems/initdscript_lsb_header_issue.conf
+++ b/known_problems/initdscript_lsb_header_issue.conf
@@ -1,7 +1,7 @@
 #
 # detect packages with an update-rc.d warning
 #
-INCLUDE='update-rc.d: warning.*do not match LSB'
+PATTERN='update-rc.d: warning.*do not match LSB'
 WHERE='fail bugged affected pass'
 ISSUE=1
 HEADER='Packages with logs with the string "update-rc.d: warning.*do not match LSB"'
diff --git a/known_problems/insserv_error.conf b/known_problems/insserv_error.conf
index 0bdda15..f40b175 100644
--- a/known_problems/insserv_error.conf
+++ b/known_problems/insserv_error.conf
@@ -1,7 +1,7 @@
 #
 # detect packages with fail due to insserv error
 #
-INCLUDE='insserv: exiting now'
+PATTERN='insserv: exiting now'
 WHERE='fail bugged affected'
 ISSUE=0
 HEADER='Packages with failed logs with the string "insserv: exiting now"'
diff --git a/known_problems/installs_over_symlink_error.conf b/known_problems/installs_over_symlink_error.conf
index e7ee12e..201f076 100644
--- a/known_problems/installs_over_symlink_error.conf
+++ b/known_problems/installs_over_symlink_error.conf
@@ -1,7 +1,7 @@
 #
 # detect packages which have the string "dirname part contains a symlink" in their logs
 #
-INCLUDE='silently overwrites files via directory symlinks|dirname part contains a symlink'
+PATTERN='silently overwrites files via directory symlinks|dirname part contains a symlink'
 WHERE='fail bugged affected'
 ISSUE=0
 HEADER='Packages that install something over existing symlinks'
diff --git a/known_problems/installs_over_symlink_issue.conf b/known_problems/installs_over_symlink_issue.conf
index 6ac6144..41ae3d1 100644
--- a/known_problems/installs_over_symlink_issue.conf
+++ b/known_problems/installs_over_symlink_issue.conf
@@ -1,7 +1,7 @@
 #
 # detect packages which have the string "dirname part contains a symlink" in their logs
 #
-INCLUDE='silently overwrites files via directory symlinks|dirname part contains a symlink'
+PATTERN='silently overwrites files via directory symlinks|dirname part contains a symlink'
 WHERE='pass'
 ISSUE=1
 HEADER='Packages that install something over existing symlinks'
diff --git a/known_problems/logrotate_error_after_removal_error.conf b/known_problems/logrotate_error_after_removal_error.conf
index 6793bcb..14bae35 100644
--- a/known_problems/logrotate_error_after_removal_error.conf
+++ b/known_problems/logrotate_error_after_removal_error.conf
@@ -1,7 +1,7 @@
 #
 # detect packages with logrotate errors after the package has been removed
 #
-INCLUDE='(FAIL: Logrotate file .* has output with package removed|ERROR: Command failed.*'/etc/logrotate\.d/.*'])'
+PATTERN='(FAIL: Logrotate file .* has output with package removed|ERROR: Command failed.*'/etc/logrotate\.d/.*'])'
 WHERE='fail bugged affected'
 ISSUE=0
 HEADER='Packages with failed logs because a logrotate script has output and/or exits with error after the package has been removed'
diff --git a/known_problems/maintainer_script_issue.conf b/known_problems/maintainer_script_issue.conf
index 4fffd96..9a25f41 100644
--- a/known_problems/maintainer_script_issue.conf
+++ b/known_problems/maintainer_script_issue.conf
@@ -1,7 +1,7 @@
 #
 # detect packages in successfully-tested state that had maintainer script failures
 #
-INCLUDE='subprocess .*(pre|post)-(installation|removal) script returned error'
+PATTERN='subprocess .*(pre|post)-(installation|removal) script returned error'
 WHERE='pass'
 ISSUE=0
 HEADER='Packages in state successfully-tested but logfile contains a maintainer script failure'
diff --git a/known_problems/modified_files_after_purge_error.conf b/known_problems/modified_files_after_purge_error.conf
index a485045..ba21152 100644
--- a/known_problems/modified_files_after_purge_error.conf
+++ b/known_problems/modified_files_after_purge_error.conf
@@ -1,8 +1,8 @@
 #
 # detect packages with modified files after purge
 #
-INCLUDE='FAIL: After purging files have been modified:'
-EXCLUDE=',|usr/local'
+PATTERN='FAIL: After purging files have been modified:'
+EXCLUDE_PATTERN=',|usr/local'
 WHERE='fail bugged affected'
 ISSUE=0
 HEADER='Packages with modified files after purge'
diff --git a/known_problems/needs_rebuild_issue.conf b/known_problems/needs_rebuild_issue.conf
index d0b5dc8..5451ff3 100644
--- a/known_problems/needs_rebuild_issue.conf
+++ b/known_problems/needs_rebuild_issue.conf
@@ -1,7 +1,7 @@
 #
 # detect packages which have the string "Please rebuild the package" or "package ... should be rebuilt" in their logs
 #
-INCLUDE="Please rebuild the package|should be rebuilt|should be rebuild|warning: maintainer scripts should not call install-info anymore"
+PATTERN="Please rebuild the package|should be rebuilt|should be rebuild|warning: maintainer scripts should not call install-info anymore"
 WHERE='pass'
 ISSUE=1
 HEADER='Packages which have logs with the string "Please rebuild the package" or "package ... should be rebuilt"'
diff --git a/known_problems/obsolete_conffiles_error.conf b/known_problems/obsolete_conffiles_error.conf
index 0a6b5a8..42582c1 100644
--- a/known_problems/obsolete_conffiles_error.conf
+++ b/known_problems/obsolete_conffiles_error.conf
@@ -1,7 +1,7 @@
 #
 # detect packages that leave obsolete conffiles after upgrades
 #
-INCLUDE='OBSOLETE CONFFILE'
+PATTERN='OBSOLETE CONFFILE'
 WHERE='fail bugged affected'
 ISSUE=1
 HEADER='Packages leaving obsolete conffiles after upgrade'
diff --git a/known_problems/obsolete_conffiles_issue.conf b/known_problems/obsolete_conffiles_issue.conf
index 8abeb7d..0be80ed 100644
--- a/known_problems/obsolete_conffiles_issue.conf
+++ b/known_problems/obsolete_conffiles_issue.conf
@@ -1,7 +1,7 @@
 #
 # detect packages that leave obsolete conffiles after upgrades
 #
-INCLUDE='OBSOLETE CONFFILE'
+PATTERN='OBSOLETE CONFFILE'
 WHERE='pass'
 ISSUE=1
 HEADER='Packages leaving obsolete conffiles after upgrade'
diff --git a/known_problems/overwrite_other_packages_files_error.conf b/known_problems/overwrite_other_packages_files_error.conf
index c3e6268..ca0aed8 100644
--- a/known_problems/overwrite_other_packages_files_error.conf
+++ b/known_problems/overwrite_other_packages_files_error.conf
@@ -1,7 +1,7 @@
 #
 # detect packages which try to overwrite other packages files
 #
-INCLUDE='trying to overwrite (.*) which is also in package'
+PATTERN='trying to overwrite (.*) which is also in package'
 WHERE='fail bugged affected'
 ISSUE=0
 HEADER='Packages with failed logs because they tried to overwrite other packages files'
diff --git a/known_problems/owned_files_after_purge_error.conf b/known_problems/owned_files_after_purge_error.conf
index 7c00174..624259f 100644
--- a/known_problems/owned_files_after_purge_error.conf
+++ b/known_problems/owned_files_after_purge_error.conf
@@ -1,8 +1,8 @@
 #
 # detect packages with owned files after purge (policy 6.8)
 #
-INCLUDE='owned by:'
-EXCLUDE=',|usr/local/'
+PATTERN='owned by:'
+EXCLUDE_PATTERN=',|usr/local/'
 WHERE='fail bugged affected'
 ISSUE=0
 HEADER='Packages with owned files after purge'
diff --git a/known_problems/owned_files_after_purge_issue.conf b/known_problems/owned_files_after_purge_issue.conf
index c16182a..54b14e3 100644
--- a/known_problems/owned_files_after_purge_issue.conf
+++ b/known_problems/owned_files_after_purge_issue.conf
@@ -1,7 +1,7 @@
 #
 # detect packages with owned files after purge (policy 6.8)
 #
-INCLUDE='owned by:'
+PATTERN='owned by:'
 WHERE='pass'
 ISSUE=1
 HEADER='Packages with owned files after purge'
diff --git a/known_problems/owned_files_by_many_packages_error.conf b/known_problems/owned_files_by_many_packages_error.conf
index 3717336..4c6a6fc 100644
--- a/known_problems/owned_files_by_many_packages_error.conf
+++ b/known_problems/owned_files_by_many_packages_error.conf
@@ -1,7 +1,7 @@
 #
 # detect conffiles owned by two or more packages which are not removed by dpkg correctly
 #
-INCLUDE='owned by.+,'
+PATTERN='owned by.+,'
 WHERE='fail bugged affected'
 ISSUE=0
 HEADER='Packages with failed logs which have conffiles owned by two or more packages which are not removed by dpkg correctly'
diff --git a/known_problems/packages_have_been_kept_back_error.conf b/known_problems/packages_have_been_kept_back_error.conf
index e1c0dd1..e65d845 100644
--- a/known_problems/packages_have_been_kept_back_error.conf
+++ b/known_problems/packages_have_been_kept_back_error.conf
@@ -1,7 +1,7 @@
 #
 # detect possible dependency issues
 #
-INCLUDE='packages have been kept back'
+PATTERN='packages have been kept back'
 WHERE='fail bugged affected'
 ISSUE=0
 HEADER='Packages with logs with the string "packages have been kept back"'
diff --git a/known_problems/packages_have_been_kept_back_issue.conf b/known_problems/packages_have_been_kept_back_issue.conf
index 6fa26b3..ac2e126 100644
--- a/known_problems/packages_have_been_kept_back_issue.conf
+++ b/known_problems/packages_have_been_kept_back_issue.conf
@@ -1,7 +1,7 @@
 #
 # detect possible dependency issues
 #
-INCLUDE='packages have been kept back'
+PATTERN='packages have been kept back'
 WHERE='pass'
 ISSUE=1
 HEADER='Packages with logs with the string "packages have been kept back"'
diff --git a/known_problems/post_installation_script_error.conf b/known_problems/post_installation_script_error.conf
index 5deb2dd..4450ce9 100644
--- a/known_problems/post_installation_script_error.conf
+++ b/known_problems/post_installation_script_error.conf
@@ -1,7 +1,7 @@
 #
 # detect packages which failed because post-installation maintainer script failed
 #
-INCLUDE='subprocess .*post-installation script returned error'
+PATTERN='subprocess .*post-installation script returned error'
 WHERE='fail bugged affected'
 ISSUE=0
 HEADER='Packages with failed logs because post-installation maintainer script failed'
diff --git a/known_problems/post_removal_script_error.conf b/known_problems/post_removal_script_error.conf
index b7f3af9..f429c5c 100644
--- a/known_problems/post_removal_script_error.conf
+++ b/known_problems/post_removal_script_error.conf
@@ -1,7 +1,7 @@
 #
 # detect packages which failed because post-removal maintainer script failed
 #
-INCLUDE='subprocess .*post-removal script returned error'
+PATTERN='subprocess .*post-removal script returned error'
 WHERE='fail bugged affected'
 ISSUE=0
 HEADER='Packages with failed logs because post-removal maintainer script failed'
diff --git a/known_problems/pre_depends_error.conf b/known_problems/pre_depends_error.conf
index f89be8a..6f4cfe9 100644
--- a/known_problems/pre_depends_error.conf
+++ b/known_problems/pre_depends_error.conf
@@ -1,7 +1,7 @@
 #
 # detect packages which failed because of a problem with pre-depends
 #
-INCLUDE='E: Couldn.t configure pre-depend .* for .*, probably a dependency cycle.'
+PATTERN='E: Couldn.t configure pre-depend .* for .*, probably a dependency cycle.'
 WHERE='fail bugged affected'
 ISSUE=0
 HEADER='Packages with failed logs because of a problem with pre-depends '
diff --git a/known_problems/pre_installation_script_error.conf b/known_problems/pre_installation_script_error.conf
index 63f5a73..f0b08c3 100644
--- a/known_problems/pre_installation_script_error.conf
+++ b/known_problems/pre_installation_script_error.conf
@@ -1,7 +1,7 @@
 #
 # detect packages which failed because pre-installation maintainer script failed
 #
-INCLUDE='subprocess .*pre-installation script returned error'
+PATTERN='subprocess .*pre-installation script returned error'
 WHERE='fail bugged affected'
 ISSUE=0
 HEADER='Packages with failed logs because pre-installation maintainer script failed'
diff --git a/known_problems/pre_removal_script_error.conf b/known_problems/pre_removal_script_error.conf
index 62f6a04..073fa26 100644
--- a/known_problems/pre_removal_script_error.conf
+++ b/known_problems/pre_removal_script_error.conf
@@ -1,7 +1,7 @@
 #
 # detect packages which failed because pre-removal maintainer script failed
 #
-INCLUDE='subprocess .*pre-removal script returned error'
+PATTERN='subprocess .*pre-removal script returned error'
 WHERE='fail bugged affected'
 ISSUE=0
 HEADER='Packages with failed logs because pre-removal maintainer script failed'
diff --git a/known_problems/problems_and_no_force_error.conf b/known_problems/problems_and_no_force_error.conf
index ddbc276..f6ab54b 100644
--- a/known_problems/problems_and_no_force_error.conf
+++ b/known_problems/problems_and_no_force_error.conf
@@ -1,7 +1,7 @@
 #
 # detect packages with problems because of not enough force
 #
-INCLUDE='E: There are problems and -y was used without --force-yes'
+PATTERN='E: There are problems and -y was used without --force-yes'
 WHERE='fail bugged affected'
 ISSUE=0
 HEADER='Packages with failed logs because of not enough force'
diff --git a/known_problems/processes_running_error.conf b/known_problems/processes_running_error.conf
index 33cd5d7..91dbafc 100644
--- a/known_problems/processes_running_error.conf
+++ b/known_problems/processes_running_error.conf
@@ -1,7 +1,7 @@
 #
 # detect packages which failed because of processes are running inside chroot
 #
-INCLUDE='ERROR: FAIL: Processes are running inside chroot'
+PATTERN='ERROR: FAIL: Processes are running inside chroot'
 WHERE='fail bugged affected'
 ISSUE=0
 HEADER='Packages with failed logs because of processes left behind'
diff --git a/known_problems/resource_violation_error.conf b/known_problems/resource_violation_error.conf
index eab1030..5f7bce5 100644
--- a/known_problems/resource_violation_error.conf
+++ b/known_problems/resource_violation_error.conf
@@ -1,7 +1,7 @@
 #
 # detect packages violating resource limits during the test
 #
-INCLUDE='Command was terminated after exceeding|Process KILLED - exceed maximum run time'
+PATTERN='Command was terminated after exceeding|Process KILLED - exceed maximum run time'
 WHERE='fail bugged affected'
 ISSUE=0
 HEADER='Packages where the test was aborted after exceeding time or output limit'
diff --git a/known_problems/unknown_purge_error.conf b/known_problems/unknown_purge_error.conf
index 37dcdae..7d5a8c7 100644
--- a/known_problems/unknown_purge_error.conf
+++ b/known_problems/unknown_purge_error.conf
@@ -1,7 +1,7 @@
 #
 # detect packages which try to overwrite other packages files
 #
-INCLUDE='ERROR: Command failed .*.dpkg., .--purge., .--pending.]'
+PATTERN='ERROR: Command failed .*.dpkg., .--purge., .--pending.]'
 WHERE='fail bugged affected'
 ISSUE=0
 HEADER='Packages with failed logs because dpkg --purge --pending failed'
diff --git a/known_problems/unowned_files_after_purge_error.conf b/known_problems/unowned_files_after_purge_error.conf
index 3bbd997..f19fddc 100644
--- a/known_problems/unowned_files_after_purge_error.conf
+++ b/known_problems/unowned_files_after_purge_error.conf
@@ -1,8 +1,8 @@
 #
 # detect packages with unowned files after purge (policy 6.8)
 #
-INCLUDE='not owned'
-EXCLUDE='/usr/share/mime/|usr/local/'
+PATTERN='not owned'
+EXCLUDE_PATTERN='/usr/share/mime/|usr/local/'
 WHERE='fail bugged affected'
 ISSUE=0
 HEADER='Packages with unowned files after purge'
diff --git a/known_problems/unowned_files_after_purge_issue.conf b/known_problems/unowned_files_after_purge_issue.conf
index 33a8d93..1fdcde2 100644
--- a/known_problems/unowned_files_after_purge_issue.conf
+++ b/known_problems/unowned_files_after_purge_issue.conf
@@ -1,8 +1,8 @@
 #
 # detect packages with unowned files after purge (policy 6.8)
 #
-INCLUDE='not owned'
-EXCLUDE="/usr/share/mime/|usr/local/"
+PATTERN='not owned'
+EXCLUDE_PATTERN="/usr/share/mime/|usr/local/"
 WHERE='pass'
 ISSUE=1
 HEADER='Packages with unowned files after purge'
diff --git a/master-bin/detect_well_known_errors b/master-bin/detect_well_known_errors
index 82ac205..16b3f87 100755
--- a/master-bin/detect_well_known_errors
+++ b/master-bin/detect_well_known_errors
@@ -111,10 +111,10 @@ class Problem():
 
         self.init_problem()
 
-        self.inc_re = re.compile( self.INCLUDE )
+        self.inc_re = re.compile( self.PATTERN )
 
-        if "EXCLUDE" in self.__dict__:
-            self.exc_re = re.compile( self.EXCLUDE )
+        if "EXCLUDE_PATTERN" in self.__dict__:
+            self.exc_re = re.compile( self.EXCLUDE_PATTERN )
         else:
             self.exc_re = None
 
@@ -157,10 +157,10 @@ class Problem():
 
     def get_command(self):
 
-        cmd = "grep -E \"%s\"" % self.INCLUDE
+        cmd = "grep -E \"%s\"" % self.PATTERN
 
-        if "EXCLUDE" in self.__dict__:
-            cmd += " | grep -v -E \"%s\"" % self.EXCLUDE
+        if "EXCLUDE_PATTERN" in self.__dict__:
+            cmd += " | grep -v -E \"%s\"" % self.EXCLUDE_PATTERN
 
         return(cmd)
 

-- 
piuparts git repository

More information about the Piuparts-commits mailing list