[Piuparts-commits] [piuparts] 01/03: detect_archive_issues: move archive_issues.txt to master/

[Holger Levsen]

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

holger pushed a commit to branch develop
in repository piuparts.

commit 39d44575e081b04c285caa74a5fa2467ad9f1f52
Author: Andreas Beckmann <anbe at debian.org>
Date:   Wed Jan 21 03:51:42 2015 +0100

    detect_archive_issues: move archive_issues.txt to master/
    
    statefile does not really belong into htdocs
    should be backed up, too
    
    Signed-off-by: Andreas Beckmann <anbe at debian.org>
---
 debian/changelog                    | 1 +
 master-bin/detect_archive_issues.in | 8 +++-----
 master-bin/prepare_backup.in        | 1 +
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 98661ac..eeae797 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -18,6 +18,7 @@ piuparts (0.63) UNRELEASED; urgency=medium
   * piuparts-slave.py:
     - Handle Ctrl-C while downloading Packages files and flush/unreserve, too.
     - Catch another exception that may happen while talking to the master.
+  * detect_archive_issues: Move archive_issues.txt from htdocs/ to master/.
   * detect_piuparts_issues: Detect transient apt-cache failures.
   * generate_daily_report: Remove obsolete .html files (e.g. summaries for
     removed source packages or retired maintainers) after 30 days.
diff --git a/master-bin/detect_archive_issues.in b/master-bin/detect_archive_issues.in
index b572d2b..d232a95 100755
--- a/master-bin/detect_archive_issues.in
+++ b/master-bin/detect_archive_issues.in
@@ -22,7 +22,6 @@
 
 get_config_value MASTER global master-directory
 get_config_value SECTIONS global sections
-get_config_value HTDOCS global output-directory
 get_config_value URLBASE global urlbase https://piuparts.debian.org
 get_config_value DAYS global reschedule-untestable-days 7
 
@@ -47,9 +46,8 @@ for SECTION in $SECTIONS ; do
 	fi
 done
 if [ -s $URLS ]; then
-	mkdir -p $HTDOCS
-	date >> $HTDOCS/archive_issues.txt
-	cat $URLS >> $HTDOCS/archive_issues.txt
+	date >> $MASTER/archive_issues.txt
+	cat $URLS >> $MASTER/archive_issues.txt
 	echo "Broken packages detected!"
 	echo "(By grep'ing for"
 	echo "        'E: Broken packages',"
@@ -66,7 +64,7 @@ if [ -s $URLS ]; then
 	echo "If it is always the same package failing, it's likely to be an issue in the"
 	echo "package."
 	echo
-	grep -f $URLS $HTDOCS/archive_issues.txt | sort | uniq -c | sort -rn
+	grep -f $URLS $MASTER/archive_issues.txt | sort | uniq -c | sort -rn
 	echo
 fi
 rm $LOGS $URLS
diff --git a/master-bin/prepare_backup.in b/master-bin/prepare_backup.in
index 3db74a2..91aa0fd 100755
--- a/master-bin/prepare_backup.in
+++ b/master-bin/prepare_backup.in
@@ -45,6 +45,7 @@ copy_to_backupdir() {
 
 test -n "$BACKUPDIR" || exit 0
 
+copy_to_backupdir archive_issues.txt
 copy_to_backupdir bts_stats.txt
 for SECTION in $SECTIONS ; do
 	mkdir -p $BACKUPDIR/$SECTION

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