[Piuparts-commits] [SCM] piuparts git repository branch, develop, updated. 0.45-27-g90c7016

[Andreas Beckmann]

The following commit has been merged in the develop branch:
commit 90c7016e88e51f3d79f9ecc7d1910095f98f47b8
Author: Andreas Beckmann <debian at abeckmann.de>
Date:   Sat Jun 23 12:32:59 2012 +0200

    adjust Makefile for updated layout
    
    Signed-off-by: Andreas Beckmann <debian at abeckmann.de>

diff --git a/Makefile b/Makefile
index 9cc9d0f..a0167af 100644
--- a/Makefile
+++ b/Makefile
@@ -43,11 +43,6 @@ install-conf:
 	install -m 0644 conf/crontab-slave $(DESTDIR)$(etcdir)/cron.d/piuparts-slave
 	sed -i -r '/^[^#]+/s/^/#/' $(etcdir)/cron.d/piuparts-*
 
-	install -d $(etcdir)/piuparts/known_problems
-	for fl in home/piupartsm/bin/known_problems/* ; do\
-            install -m 0644 $$fl $(etcdir)/piuparts/known_problems; \
-        done
-
 	install -d $(etcdir)/sudoers.d
 	install -m 440 conf/piuparts.sudoers $(etcdir)/sudoers.d/piuparts
 	sed -i -r '/^[^#]+/s/^/#/' $(etcdir)/sudoers.d/piuparts
@@ -82,16 +77,13 @@ install:
 	install -m 0644 piupartslib/*.py $(site27)/piupartslib
 
 	install -d $(sharedir)/piuparts/master
-
-	for fl in home/piupartsm/bin/* ; do\
-            if [ -f $$fl ] ; then install $$fl $(sharedir)/piuparts/master ; fi ; done
+	install -m 0755 master-bin/* $(DESTDIR)$(sharedir)/piuparts/master
 
 	install -d $(DESTDIR)$(sharedir)/piuparts/master/known_problems
-	install -m 0644 home/piupartsm/bin/known_problems/*.conf $(DESTDIR)$(sharedir)/piuparts/master/known_problems/
+	install -m 0644 known_problems/*.conf $(DESTDIR)$(sharedir)/piuparts/master/known_problems/
 
 	install -d $(sharedir)/piuparts/slave
-
-	cp -r home/piupartss/bin/* $(sharedir)/piuparts/slave
+	install -m 0755 slave-bin/* $(DESTDIR)$(sharedir)/piuparts/slave
 
 	install -d $(DESTDIR)$(htdocsdir)
 	install -m 0644 htdocs/*.* $(DESTDIR)$(htdocsdir)/
@@ -109,6 +101,9 @@ install:
 		install -d $(DESTDIR)$(etcdir)/piuparts/$$d ; \
 		install -m 0755 custom-scripts/$$d/* $(DESTDIR)$(etcdir)/piuparts/$$d/ ; done
 
+	#install -d $(DESTDIR)$(etcdir)/piuparts/known_problems
+	#install -m 0644 known_problems/*.conf $(DESTDIR)$(etcdir)/piuparts/known_problems/
+
 
 check:
 	python piuparts.py unittest
diff --git a/TODO b/TODO
index 1e5379c..0d8e1c1 100644
--- a/TODO
+++ b/TODO
@@ -16,12 +16,6 @@ for 0.46:
 - master: duplicate log submission handling
   break the slave: send -> master: reject infinite loop
 
-- sanitize directory structure:
-  org/piuparts.debian.org/etc/piuparts.conf.* ==> ???
-  home/*/crontab ==> ???
-  home/*/.forward ==> ???
-  home/*/bin ==> ???
-
 - make piuparts-master + piuparts-slave packages work out-of-the-box
 
 - ship sane minimal sudoers in p-s.deb than can be enabled by default
@@ -45,6 +39,7 @@ for 0.46:
 
 - use cdn.debian.net as mirror default (instead of "your.mirror.here") and provide
   a debconf template to overwrite this.
+  or http.debian.net ?
 
 - rework known_problems:
   - use a number prefix for sorting

-- 
piuparts git repository