revisor/pungi.py | 12 +++++++
revisor/splittree.py | 2 -
unity/share/index.php | 77 ++++++++++++++++++++++++++++++++++++++++++++++++++
3 files changed, 90 insertions(+), 1 deletion(-)
New commits:
commit 82af73a7c33a708e6a2aa0fb02adf21698433eb1
Author: Jeroen van Meeuwen (Fedora Unity) <kana...@fedoraunity.org>
Date: Thu Jul 23 13:01:47 2009 +0200
Give discs a rough minimum reserved size
diff --git a/revisor/splittree.py b/revisor/splittree.py
index 1e46205..dac96d2 100755
--- a/revisor/splittree.py
+++ b/revisor/splittree.py
@@ -65,7 +65,7 @@ and RPMs. Set to 1 to turn on.
self.reserve_size : Additional size needed to be reserved on the first disc.
"""
- self.reserve_size = 0
+ self.reserve_size = 900 * 1024
self.disc_size = 640.0
self.target_size = self.disc_size * 1024.0 * 1024
self.fudge_factor = 1.2 * 1024.0 * 1024
commit ea7c2b62322e45c612bc33ab751a1ed0d5fd2c47
Author: Jeroen van Meeuwen (Fedora Unity) <kana...@fedoraunity.org>
Date: Thu Jul 23 13:01:20 2009 +0200
Make sure we don't overestimate the number of discs needed
diff --git a/revisor/pungi.py b/revisor/pungi.py
index a313791..987acaf 100644
--- a/revisor/pungi.py
+++ b/revisor/pungi.py
@@ -464,6 +464,18 @@ cost=500
timber.total_discs = self.cfg.mediatypes[discdir]["discs"]
timber.bin_discs = self.cfg.mediatypes[discdir]["discs"]
we_are_ok = False
+ elif disc_size <= timber.reserve_size:
+ self.log.debug(_("Disc %s #%d is undersized (%r <= %r)") %
(self.cfg.mediatypes[discdir]["label"], disc, disc_size, timber.reserve_size),
level=9)
+
+ # Destroy the old disc directories
+ for i in range(1, timber.total_discs + 1):
+ self.log.debug(_("Removing tree %s") % ("%s-%s-disc%d"
% (self.topdir,discdir,i)), level=9)
+ shutil.rmtree("%s-%s-disc%d" % (self.topdir,discdir,i))
+
+ self.cfg.mediatypes[discdir]["discs"] -= 1
+ timber.total_discs = self.cfg.mediatypes[discdir]["discs"]
+ timber.bin_discs = self.cfg.mediatypes[discdir]["discs"]
+ we_are_ok = False
else:
self.log.debug(_("Disc %s #%d is OK in size (%r <= %r)") %
(self.cfg.mediatypes[discdir]["label"], disc, disc_size, timber.target_size),
level=9)
commit dfc80d4999b068bf6eba8338c74f3dfb1cd777b3
Merge: 1b9e3b9... 7f078cd...
Author: Jeroen van Meeuwen (Fedora Unity) <kana...@fedoraunity.org>
Date: Thu Jul 23 11:42:36 2009 +0200
Merge branch 'master' of ssh://git.kanarip.com/srv/git/revisor
commit 7f078cdd1b13e17e2e3e1142e78d7b1ab7826e7d
Merge: 0832136... 8cfc63a...
Author: Jeroen van Meeuwen (Fedora Unity) <kana...@fedoraunity.org>
Date: Tue Jul 21 14:13:51 2009 +0200
Merge branch 'master' of ssh://git.fedorahosted.org/git/revisor
commit 08321369e5232808a9f7975ae4fc1596b24b232b
Merge: f36e7dd... f1ffd3b...
Author: Jeroen van Meeuwen (Fedora Unity) <kana...@fedoraunity.org>
Date: Sun Jul 19 15:46:47 2009 +0200
Merge branch 'master' of ssh://git.kanarip.com/srv/git/revisor
commit f36e7dd40c4fe36266a9c039f5bcb2ea44930f24
Author: Jeroen van Meeuwen (Fedora Unity) <kana...@fedoraunity.org>
Date: Sun Jul 19 11:34:57 2009 +0200
Add index.php for http://www.kanarip.com/revisor/
diff --git a/unity/share/index.php b/unity/share/index.php
new file mode 100644
index 0000000..033870b
--- /dev/null
+++ b/unity/share/index.php
@@ -0,0 +1,77 @@
+<?php
+
+ $spins = Array();
+
+ $path = scandir("/data/revisor/", 1);
+
+ foreach ($path as $key => $date) {
+
+ if ( $date !== "." && $date !== ".." && $date !== "index.php" &&
strlen($date) == 8 ) {
+
+ $spins[$date] = Array(
+ "rawhide" => Array(
+ "i386" => Array(),
+ "ppc" => Array(),
+ "x86_64" => Array()),
+ "f11" => Array(
+ "i386" => Array(),
+ "ppc" => Array(),
+ "x86_64" => Array()),
+ "f10" => Array(
+ "i386" => Array(),
+ "ppc" => Array(),
+ "x86_64" => Array())
+ );
+
+ $datepath = scandir("/data/revisor/$date/");
+
+ foreach ($datepath as $key => $spin) {
+
+ if ( $spin !== "." && $spin !== ".." ) {
+ if ( is_dir("/data/revisor/$date/$spin") ) {
+ $spin_details = split("-", $spin, 3);
+
$spins[$date][$spin_details[0]][$spin_details[1]][$spin_details[2]] = 1;
+ }
+ }
+ }
+ }
+ }
+
+
+ foreach ($spins as $date => $versions) {
+ echo "<h1><a href=\"/revisor/$date/\">$date</a></h1>\n";
+
+ echo "<table width=\"60%\" border=\"1\">\n";
+ echo "<tr><td> </td><td valign=\"top\"><h2>i386</h2></td><td
valign=\"top\"><h2>ppc</h2></td><td valign=\"top\"><h2>x86_64</h2></td></tr>\n";
+
+ foreach ($versions as $version => $archs) {
+ echo "<tr><td valign=\"top\"><h2>$version</h2></td>";
+
+ foreach ($archs as $arch => $spins) {
+ echo "<td valign=\"top\"><table width=\"100%\">";
+
+ foreach ($spins as $spin => $useless_value) {
+ if (
file_exists("/data/revisor/$date/$version-$arch-$spin.success") ) {
+ echo "<tr><td width=\"400\" bgcolor=\"#00FF00;\"><a
href=\"/revisor/$date/$version-$arch-$spin/\">$spin</a></td></tr>";
+ } else {
+ if (
is_dir("/data/revisor/$date/$version-$arch-$spin/log/") ) {
+ echo "<tr><td width=\"400\"
bgcolor=\"#FF0000;\"><a href=\"/revisor/$date/$version-$arch-$spin/\">$spin</a>
(<a
href=\"/revisor/$date/$version-$arch-$spin/log/revisor-$version-$arch-$spin.log\">log</a>)</td></tr>";
+
+ } else {
+ echo "<tr><td width=\"400\"
bgcolor=\"#AAAAAA;\"><a href=\"/revisor/$date/$version-$arch-$spin/\">$spin</a>
(in progress or cancelled)</td>";
+ }
+ }
+ }
+
+ echo "</table></td>";
+ }
+
+ echo "</tr>";
+ }
+
+ echo "</table>";
+ }
+?>
+
+ </tbody>
+</table>
_______________________________________________
revisor-devel mailing list
revisor-devel@lists.fedorahosted.org
https://fedorahosted.org/mailman/listinfo/revisor-devel
