[Piuparts-commits] [SCM] piuparts git repository branch, develop, updated. 0.49-82-g7e76d1d

[Andreas Beckmann]

The following commit has been merged in the develop branch:
commit f494915803464e258267f3c1aea0def37edb7de8
Author: Andreas Beckmann <anbe at debian.org>
Date:   Sat Feb 23 08:52:38 2013 +0100

    install known_problems to @sharedir@/piuparts/known_problems
    
    these don't really belong to the master's bin directory
    
    /etc/piuparts/known_problems may be considered in the future
    
    Signed-off-by: Andreas Beckmann <anbe at debian.org>

diff --git a/Makefile b/Makefile
index 6c67fac..f30ac85 100644
--- a/Makefile
+++ b/Makefile
@@ -93,8 +93,8 @@ install:
 	install -d $(DESTDIR)$(sharedir)/piuparts/master
 	install -m 0755 $(filter-out %.in,$(wildcard master-bin/*)) $(DESTDIR)$(sharedir)/piuparts/master/
 
-	install -d $(DESTDIR)$(sharedir)/piuparts/master/known_problems
-	install -m 0644 known_problems/*.conf $(DESTDIR)$(sharedir)/piuparts/master/known_problems/
+	install -d $(DESTDIR)$(sharedir)/piuparts/known_problems
+	install -m 0644 known_problems/*.conf $(DESTDIR)$(sharedir)/piuparts/known_problems/
 
 	install -d $(DESTDIR)$(sharedir)/piuparts/slave
 	install -m 0755 $(filter-out %.in,$(wildcard slave-bin/*)) $(DESTDIR)$(sharedir)/piuparts/slave/
diff --git a/debian/changelog b/debian/changelog
index 3b8fa6d..f8bea09 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -33,6 +33,7 @@ piuparts (0.50) UNRELEASED; urgency=low
     - Add support for RFC822 line continuation (wrap + indent) and comments.
   * master-bin/slave-bin: Switch to sourcing read_config.sh.
   * conf/crontab*: Substitute @sharedir@ at build time.
+  * known_problems: Install to @sharedir@/piuparts/known_problems/.
   * pre_install_exceptions: Handle bootcd-ia64 installation in squeeze.
   * post_distupgrade_exceptions: Handle libdb4.8 removal in wheezy.
   * pre_remove_50_find_bad_permissions: Add some exceptions.
diff --git a/debian/piuparts-master.install b/debian/piuparts-master.install
index ccd0a69..d5d68a6 100644
--- a/debian/piuparts-master.install
+++ b/debian/piuparts-master.install
@@ -3,6 +3,7 @@ etc/cron.d/piuparts-master
 #etc/piuparts/known_problems/
 usr/share/piuparts/htdocs/*
 usr/share/piuparts/master/*
+usr/share/piuparts/known_problems/*
 usr/share/piuparts/piuparts-analyze
 usr/share/piuparts/piuparts-master
 usr/share/piuparts/piuparts-report
diff --git a/master-bin/detect_well_known_errors.in b/master-bin/detect_well_known_errors.in
index 5c570e6..5dd01c4 100755
--- a/master-bin/detect_well_known_errors.in
+++ b/master-bin/detect_well_known_errors.in
@@ -29,7 +29,7 @@ get_config_value SECTIONS global sections
 get_config_value HTDOCS global output-directory
 
 
-PROBLEMDIR="$HOME/bin/known_problems"
+PROBLEMDIR=@sharedir@/piuparts/known_problems
 PROBLEMS=$(ls $PROBLEMDIR)
 OLDPWD=$(pwd)
 
@@ -139,7 +139,7 @@ do
 			echo '</td></tr><tr class="normalrow"><td class="contentcell2">' >> $OUTPUT
 			echo "$HELPTEXT" >> $OUTPUT
                         echo "<p>The commandline to find these logs is: <pre>" >> $OUTPUT
-			grep --color=never COMMAND ~/bin/known_problems/$problem |sed -e "s#| #| \\ \n  #g" >> $OUTPUT
+			grep --color=never COMMAND $PROBLEMDIR/$problem |sed -e "s#| #| \\ \n  #g" >> $OUTPUT
 			echo "</pre></p>" >> $OUTPUT
 			echo '</td></tr><tr class="titlerow"><td class="alerttitlecell">Please file bugs!</td></tr></tr><tr class="normalrow"><td class="contentcell2" colspan="3">' >> $OUTPUT
 			echo "<ul>" >> $OUTPUT

-- 
piuparts git repository