[Piuparts-commits] [SCM] piuparts git repository branch, piatti.git, updated. f3d478e5f291baaf9e84d1982ca5e2e6b353a232

[Andreas Beckmann]

The following commit has been merged in the piatti.git branch:
commit 51e6e8f8f46ac8ca783b21bf9c9357227626036c
Author: Andreas Beckmann <debian at abeckmann.de>
Date:   Thu Feb 23 12:03:15 2012 +0100

    detect more unsatisfied-dependency problems
    
    sync detect_archive_issues and dependency_error.conf
    
    apt in experimental now reports
      E: Unable to correct problems, you have held broken packages.
    
    update the description
    
    Signed-off-by: Andreas Beckmann <debian at abeckmann.de>

diff --git a/home/piupartsm/bin/detect_archive_issues b/home/piupartsm/bin/detect_archive_issues
index d9f116c..15a3b7f 100755
--- a/home/piupartsm/bin/detect_archive_issues
+++ b/home/piupartsm/bin/detect_archive_issues
@@ -51,7 +51,7 @@ LOGS=`mktemp`
 URLS=`mktemp`
 for SECTION in $SECTIONS ; do 
 	mkdir -p $MASTER/$SECTION/untestable/
-	rgrep -l -E "(E: Broken packages|E: Error, pkgProblemResolver::Resolve generated breaks)" $MASTER/$SECTION/fail 2>/dev/null > $LOGS
+	rgrep -l -E "E: Broken packages|E: Unable to correct problems, you have held broken packages|E: Error, pkgProblemResolver::Resolve generated breaks" $MASTER/$SECTION/fail 2>/dev/null > $LOGS
 	if [ -s $LOGS ]; then
 		for package_log in $(cat $LOGS)
 		do
@@ -65,8 +65,11 @@ if [ -s $URLS ]; then
 	date >> $HTDOCS/archive_issues.txt
 	cat $URLS >> $HTDOCS/archive_issues.txt
 	echo "Broken packages detected!"
-	echo "(By grep'ing for 'E: Broken packages' and 'E: Error, pkgProblemResolver::Resolve"
-        echo "generated breaks' in failed logs.)"
+	echo "(By grep'ing for"
+	echo "        'E: Broken packages',"
+	echo "        'E: Unable to correct problems, you have held broken packages',"
+	echo "        'E: Error, pkgProblemResolver::Resolve generated breaks'"
+	echo "in failed logs.)"
 	echo 
 	echo 'The following packages have been moved to $section/untestable and will be'
 	echo "tested again in $DAYS days."
diff --git a/home/piupartsm/bin/known_problems/dependency_error.conf b/home/piupartsm/bin/known_problems/dependency_error.conf
index 64eacc9..3106759 100644
--- a/home/piupartsm/bin/known_problems/dependency_error.conf
+++ b/home/piupartsm/bin/known_problems/dependency_error.conf
@@ -1,13 +1,14 @@
 #
-# detect packages which could not be installed
+# detect packages with unsatisfied dependencies
 #
-COMMAND='grep -E "E: Broken packages"'
+COMMAND='grep -E "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'
 ISSUE=0
-HEADER='Packages with failed logs because installation failed'
+HEADER='Packages with failed logs because of unsatisfied dependencies'
 HELPTEXT='
 <p>
-Usually this is caused by some unsatisfied (versioned) Depends/Conflicts/Replaces. These packages will be automatically rescheduled for testing seven days after they failed.
+Usually this is caused by some unsatisfied (versioned) Depends/Conflicts/Replaces.
+These packages will be automatically rescheduled for testing seven days after they failed.
 </p>
 
 '

-- 
piuparts git repository