[Piuparts-commits] rev 289 - piatti/org/piuparts.debian.org/etc trunk

[Holger Levsen]

Author: holger
Date: 2009-03-19 17:02:59 +0000 (Thu, 19 Mar 2009)
New Revision: 289

Modified:
   piatti/org/piuparts.debian.org/etc/piuparts-master.conf
   piatti/org/piuparts.debian.org/etc/piuparts-report.conf
   piatti/org/piuparts.debian.org/etc/piuparts-slave.conf
   trunk/piuparts-report.py
Log:
lenny2squeeze is not needed after all. also fix a a small error in piuparts-reports.py

Modified: piatti/org/piuparts.debian.org/etc/piuparts-master.conf
===================================================================
--- piatti/org/piuparts.debian.org/etc/piuparts-master.conf	2009-03-19 15:43:14 UTC (rev 288)
+++ piatti/org/piuparts.debian.org/etc/piuparts-master.conf	2009-03-19 17:02:59 UTC (rev 289)
@@ -11,7 +11,4 @@
 log-file = master.log
 packages-url = http://ftp.fi.debian.org/debian/dists/squeeze/main/binary-amd64/Packages.bz2
 
-[lenny2squeeze]
-log-file = master.log
-packages-url = http://ftp.fi.debian.org/debian/dists/lenny/main/binary-amd64/Packages.bz2
 

Modified: piatti/org/piuparts.debian.org/etc/piuparts-report.conf
===================================================================
--- piatti/org/piuparts.debian.org/etc/piuparts-report.conf	2009-03-19 15:43:14 UTC (rev 288)
+++ piatti/org/piuparts.debian.org/etc/piuparts-report.conf	2009-03-19 17:02:59 UTC (rev 289)
@@ -4,7 +4,7 @@
 #
 
 [report]
-sections = sid squeeze lenny2squeeze
+sections = sid squeeze
 index-page = /org/piuparts.debian.org/htdocs/index.html
 output-directory = /org/piuparts.debian.org/htdocs/
 master-directory = /org/piuparts.debian.org/master/
@@ -20,8 +20,3 @@
 packages-url = http://ftp.fi.debian.org/debian/dists/squeeze/main/binary-amd64/Packages.bz2
 master-directory = /org/piuparts.debian.org/master/
 
-[lenny2squeeze]
-output-directory = /org/piuparts.debian.org/htdocs/
-packages-url = http://ftp.fi.debian.org/debian/dists/lenny/main/binary-amd64/Packages.bz2
-master-directory = /org/piuparts.debian.org/master/
-

Modified: piatti/org/piuparts.debian.org/etc/piuparts-slave.conf
===================================================================
--- piatti/org/piuparts.debian.org/etc/piuparts-slave.conf	2009-03-19 15:43:14 UTC (rev 288)
+++ piatti/org/piuparts.debian.org/etc/piuparts-slave.conf	2009-03-19 17:02:59 UTC (rev 289)
@@ -5,7 +5,7 @@
 #
 
 [slave]
-sections = sid squeeze lenny2squeeze 
+sections = sid squeeze
 master-host = localhost
 master-user = piupartsm
 master-command = echo hello
@@ -22,7 +22,7 @@
 chroot-tgz = sid.tar.gz
 upgrade-test-distros = 
 upgrade-test-chroot-tgz = 
-max-reserved = 50
+max-reserved = 100
 
 [squeeze]
 idle-sleep = 300
@@ -34,20 +34,6 @@
 piuparts-cmd = sudo /org/piuparts.debian.org/sbin/piuparts --no-symlinks --scriptsdir /etc/piuparts/scripts/ --tmpdir /org/piuparts.debian.org/tmp
 distro = squeeze
 chroot-tgz = squeeze.tar.gz
-upgrade-test-distros = 
-upgrade-test-chroot-tgz = 
-max-reserved = 50
-
-[lenny2squeeze]
-idle-sleep = 300
-master-host = localhost
-master-user = piupartsm
-master-directory = /org/piuparts.debian.org/master/
-master-command = PYTHONPATH=/org/piuparts.debian.org/lib/python2.4/site-packages:/org/piuparts.debian.org/lib/python2.5/site-packages python /org/piuparts.debian.org/share/piuparts/piuparts-master.py lenny2squeeze
-mirror = http://ftp.fi.debian.org/debian/
-piuparts-cmd = sudo /org/piuparts.debian.org/sbin/piuparts --no-symlinks --scriptsdir /etc/piuparts/scripts/ --tmpdir /org/piuparts.debian.org/tmp
-distro = squeeze
-chroot-tgz = squeeze.tar.gz
 upgrade-test-distros = lenny squeeze
 upgrade-test-chroot-tgz = lenny.tar.gz
 max-reserved = 50

Modified: trunk/piuparts-report.py
===================================================================
--- trunk/piuparts-report.py	2009-03-19 15:43:14 UTC (rev 288)
+++ trunk/piuparts-report.py	2009-03-19 17:02:59 UTC (rev 289)
@@ -115,11 +115,6 @@
       <a href="/squeeze/">squeeze</a> 
      </td>
     </tr>
-    <tr class="normalrow">
-     <td class="contentcell">
-      <a href="/lenny2squeeze/">lenny2squeeze</a>
-     </td>
-    </tr>
     <tr class="titlerow">
      <td class="titlecell">
       Last update
@@ -550,7 +545,7 @@
         sections.append(section)
 
     logging.debug("Writing index page")
-    htmlpage = string.SafeTemplate(HTML_HEADER + INDEX_BODY_TEMPLATE + HTML_FOOTER)
+    htmlpage = string.Template(HTML_HEADER + INDEX_BODY_TEMPLATE + HTML_FOOTER)
     write_file(report_config["index-page"], htmlpage.safe_substitute( {
                                  "time": time.strftime("%Y-%m-%d %H:%M %Z"),
                               }))