SVN: toys/stbr: buildlog_link.py clean-unfilled.pl index.php queue_parser.pl
duddits
duddits at pld-linux.org
Sun Oct 2 21:24:24 CEST 2011
Author: duddits
Date: Sun Oct 2 21:24:24 2011
New Revision: 12362
Modified:
toys/stbr/buildlog_link.py
toys/stbr/clean-unfilled.pl
toys/stbr/index.php
toys/stbr/queue_parser.pl
Log:
- update link to ti/ti-dev queue (simply replace ep09.pld with kraz.tld)
Modified: toys/stbr/buildlog_link.py
==============================================================================
--- toys/stbr/buildlog_link.py (original)
+++ toys/stbr/buildlog_link.py Sun Oct 2 21:24:24 2011
@@ -78,9 +78,9 @@
except(IndexError):
return
if re.match("ti$", dist):
- os.popen("wget --quiet -N http://ep09.pld-linux.org/~builderti/queue.html")
+ os.popen("wget --quiet -N http://kraz.tld-linux.org/~builderti/queue.html")
elif re.match("ti-dev", dist):
- os.popen("wget --quiet -N http://ep09.pld-linux.org/~buildertidev/queue.html")
+ os.popen("wget --quiet -N http://kraz.tld-linux.org/~buildertidev/queue.html")
else:
os.popen("wget --quiet -N http://ep09.pld-linux.org/~builderth/queue.html")
Modified: toys/stbr/clean-unfilled.pl
==============================================================================
--- toys/stbr/clean-unfilled.pl (original)
+++ toys/stbr/clean-unfilled.pl Sun Oct 2 21:24:24 2011
@@ -17,7 +17,7 @@
aidath => 'http://ep09.pld-linux.org/~builderaidath/queue.gz',
ac => 'http://ep09.pld-linux.org/~buildsrc/queue.gz',
th => 'http://ep09.pld-linux.org/~builderth/queue.gz',
- ti => 'http://ep09.pld-linux.org/~builderti/queue.gz',
+ ti => 'http://kraz.tld-linux.org/~builderti/queue.gz',
);
sub get
Modified: toys/stbr/index.php
==============================================================================
--- toys/stbr/index.php (original)
+++ toys/stbr/index.php Sun Oct 2 21:24:24 2011
@@ -10,8 +10,8 @@
$distros = array(
"th" => "http://ep09.pld-linux.org/~builderth/queue.gz",
- "ti" => "http://ep09.pld-linux.org/~builderti/queue.gz",
- "ti-dev" => "http://ep09.pld-linux.org/~buildertidev/queue.gz"
+ "ti" => "http://kraz.tld-linux.org/~builderti/queue.gz",
+ "ti-dev" => "http://kraz.tld-linux.org/~buildertidev/queue.gz"
);
foreach($distros as $line => $url)
@@ -19,7 +19,7 @@
$queue[$line] = new Queue($url);
}
?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="pl">
<head>
<title>Send To Builder Requests (RC2)</title>
@@ -27,16 +27,16 @@
<style type="text/css">
h2 { text-align: center; }
-body, td { font-family: Verdana; font-size: 9pt; }
+body, td { font-family: Verdana; font-size: 9pt; background-image:url('white-stripes.png'); margin:0; }
table { border-collapse: collapse; width: 100%; }
td { padding: 6px 15px; }
tr.entry { padding: 6px 15px; border-top: 3px solid #ebebe4; border-bottom: 1px solid #ebebe4 }
tr.branch { padding: 6px 15px; width: 150px; color: red; }
-.thead td, thead td, tfoot td { background-color: #ebebe4 }
+.thead td, thead td, tfoot td { background: #ebebe4 }
.thead td, thead td { border-bottom: 1px solid #c0c0c0; border-top: 1px solid #c0c0c0; padding: 5px 15px }
.thead td a, thead td a { color: #000000 }
tfoot td { border-top: 2px solid #c0c0c0; border-bottom: 1px solid #c0c0c0 }
-tfoot td a { display: block; padding: 2px 5px; border: 1px outset; float: left; border: 1px solid #c0c0c0; background-color: #ffffff; color: #000000; text-decoration: none; margin-left: 5px }
+tfoot td a { display: block; padding: 2px 5px; border: 1px outset; float: left; border: 1px solid #c0c0c0; background: #ffffff; color: #000000; text-decoration: none; margin-left: 5px }
#phonebookTable thead tr td div {
text-align: center;
font-weight: bold;
@@ -92,7 +92,7 @@
position: absolute;
padding: 2px;
border: 2px solid #c0c0c0;
- background-color: #ebebe4;
+ background: #ebebe4;
color: #000;
z-index: 1000;
right: auto;
@@ -256,11 +256,9 @@
</script>
</head>
-<body topmargin="0">
-
-<img src="stbr-ng.png">
-<div style="float:right;margin:10px 5px 0 0"><a href="http://pld-users.org/en/howtos/stbr-how-to-put-a-package-into-pld-repository">» How to put a package into PLD repo</a><br/><a href="/stats">» STBR stats</a></div>
-<div onclick="javascript:document.getElementById('usageinfo').style.display='block'; this.style.display='none';">[ Click to show usage info ]</div>
+<body>
+<a href="/" title="PLD STBR"><img src="stbr-ng.png" alt="PLD STBR" style="border:0;" /></a>
+<div style="float:right;margin:10px 0 0 0;background:#ebebe4;border-bottom:1px solid #c0c0c0;border-top:1px solid #c0c0c0;padding: 5px 15px"><a href="http://pld-users.org/en/howtos/stbr-how-to-put-a-package-into-pld-repository">» How to put a package into PLD repo</a><br/><a href="/stats">» STBR stats</a><p>Queue status:<br/><a href="http://ep09.pld-linux.org/~builderth/queue.html">» Th builder queue</a><br/><a href="http://kraz.tld-linux.org/~builderti/queue.html">» Ti builder queue</a><br/><a href="http://kraz.tld-linux.org/~buildertidev/queue.html">» Ti-dev builder queue</a></p></div> <div onclick="javascript:document.getElementById('usageinfo').style.display='block'; this.style.display='none';">[ Click to show usage info ]</div>
<table style="width: 950px; margin-bottom: 3em; display: none" id="usageinfo">
<thead>
@@ -273,10 +271,14 @@
<td>Shows help information on private chat</td></tr>
<tr><td class="branch">!stbr url</td>
<td>Shows URL to this site on private chat</td></tr>
+<tr><td class="branch">!stat spec [BRANCH]</td>
+<td>Checks if spec exists on BRANCH, if BRANCH is not set HEAD is taken</td></tr>
+<tr><td class="branch">!del spec date time</td>
+<td>(<b>for admins only</b>) removes request and sends cancelation email</td></tr>
<tr><td class="branch">!stbr th upgrade spec1 spec2:DEVEL</td>
<td>Sends upgrade request for spec1 on branch HEAD<br/>and spec2 on branch DEVEL to TH developers</td></tr>
-<tr><td class="branch">!stbr ti noupgrade spec1</td>
-<td>Sends noupgrade request for spec1 on branch HEAD directly to Titanium builders</td></tr>
+<tr><td class="branch">!stbr th noupgrade spec1</td>
+<td>Sends noupgrade request for spec1 on branch HEAD directly to Th builders</td></tr>
<tr><td colspan="2">
To see builder status info, click on the filled request's row.</td></tr>
</tbody>
@@ -323,15 +325,21 @@
while($p = sqlite_fetch_array($query))
{
-
+
$inner = "SELECT application.recipient as arecipient, application.spec as aspec, application.branch AS abranch, ";
$inner .= " builder, line, queue_requester, queue_date, queue_flags, queue_builder_info ";
$inner .= "FROM application ";
$inner .= "LEFT JOIN status ";
$inner .= "ON (application.spec=status.spec AND application.date=status.date AND application.branch=status.branch) ";
+if(!isset($_GET['upgrade']))
+{
$inner .= "WHERE application.date='{$p['date']}' ";
+}
+else
+{
+$inner .= "WHERE builder='upgrade' ";
+}
$inner .= "ORDER BY application.date DESC";
-
//echo $inner;
$inner = sqlite_query($db, $inner);
$rows = sqlite_num_rows($inner) + 1;
@@ -367,7 +375,7 @@
foreach($filled['builder'] as $key => $value)
{
$randname = '/home/users/stbr/tmp/stbr-' . rand();
- $url = `./buildlog_link.py {$q['line']} {$filled['no']} {$key} $randname`;
+ $url = `./parser.py {$q['line']} {$filled['no']} {$key} $randname`;
//echo $q['line']." ".$filled['no']." ".$key." ".$randname."<br/>\n";
//echo $filled['no']."<br/>";
@@ -479,9 +487,10 @@
</div>
<div id="bottomlink">
<a href="./?show_all">Show all requests »</a>
+<p><a href="http://validator.w3.org/check?uri=referer"><img src="http://www.w3.org/Icons/valid-xhtml10" alt="Valid XHTML 1.0 Transitional" height="31" width="88" /></a></p>
</div>
<div id="logoPLD" onmouseover="O(event, this, 'Powered by [b]PLD[/b]')">
-<img src="logo_03.png" alt="PLD" />
+<a href="http://www.pld-linux.org/"><img src="logo_03.png" alt="PLD" style="border:0;" /></a>
</div>
<div id="Popup">EMPTY</div>
Modified: toys/stbr/queue_parser.pl
==============================================================================
--- toys/stbr/queue_parser.pl (original)
+++ toys/stbr/queue_parser.pl Sun Oct 2 21:24:24 2011
@@ -25,8 +25,8 @@
AidaTh => 'http://ep09.pld-linux.org/~builderaidath/queue.gz',
Ac => 'http://ep09.pld-linux.org/~buildsrc/queue.gz',
Th => 'http://ep09.pld-linux.org/~builderth/queue.gz',
- Ti => 'http://ep09.pld-linux.org/~builderti/queue.gz',
- "Ti-dev" => 'http://ep09.pld-linux.org/~buildertidev/queue.gz',
+ Ti => 'http://kraz.tld-linux.org/~builderti/queue.gz',
+ "Ti-dev" => 'http://kraz.tld-linux.org/~buildertidev/queue.gz',
);
my $uri = $queue_uri{ $line } || die "Line $line not supported\n";
More information about the pld-cvs-commit
mailing list