diff options
| author | Nicolas Vigier <boklm@mageia.org> | 2013-04-14 13:46:12 +0000 |
|---|---|---|
| committer | Nicolas Vigier <boklm@mageia.org> | 2013-04-14 13:46:12 +0000 |
| commit | 1be510f9529cb082f802408b472a77d074b394c0 (patch) | |
| tree | b175f9d5fcb107576dabc768e7bd04d4a3e491a0 /zarb-ml/mageia-sysadm/attachments/20110112/872f6ea4 | |
| parent | fa5098cf210b23ab4f419913e28af7b1b07dafb2 (diff) | |
| download | archives-master.tar archives-master.tar.gz archives-master.tar.bz2 archives-master.tar.xz archives-master.zip | |
Diffstat (limited to 'zarb-ml/mageia-sysadm/attachments/20110112/872f6ea4')
| -rw-r--r-- | zarb-ml/mageia-sysadm/attachments/20110112/872f6ea4/attachment-0001.html | 235 | ||||
| -rw-r--r-- | zarb-ml/mageia-sysadm/attachments/20110112/872f6ea4/attachment.html | 235 |
2 files changed, 470 insertions, 0 deletions
diff --git a/zarb-ml/mageia-sysadm/attachments/20110112/872f6ea4/attachment-0001.html b/zarb-ml/mageia-sysadm/attachments/20110112/872f6ea4/attachment-0001.html new file mode 100644 index 000000000..ad8f1dc2e --- /dev/null +++ b/zarb-ml/mageia-sysadm/attachments/20110112/872f6ea4/attachment-0001.html @@ -0,0 +1,235 @@ +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" +"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd"> +<html xmlns="http://www.w3.org/1999/xhtml"> +<head><meta http-equiv="content-type" content="text/html; charset=utf-8" /> +<title>[269] Import my changes + rda's style</title> +</head> +<body> + +<style type="text/css"><!-- +#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; } +#msg dl.meta dt { float: left; width: 6em; font-weight: bold; } +#msg dt:after { content:':';} +#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; } +#msg dl a { font-weight: bold} +#msg dl a:link { color:#fc3; } +#msg dl a:active { color:#ff0; } +#msg dl a:visited { color:#cc6; } +h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; } +#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; } +#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; } +#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; } +#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; } +#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; } +#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; } +#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; } +#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; } +#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; } +#logmsg pre { background: #eee; padding: 1em; } +#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;} +#logmsg dl { margin: 0; } +#logmsg dt { font-weight: bold; } +#logmsg dd { margin: 0; padding: 0 0 0.5em 0; } +#logmsg dd:before { content:'\00bb';} +#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; } +#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; } +#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; } +#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; } +#logmsg table th.Corner { text-align: left; } +#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; } +#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; } +#patch { width: 100%; } +--></style> +<div id="msg"> +<dl class="meta"> +<dt>Revision</dt> <dd>269</dd> +<dt>Author</dt> <dd>pterjan</dd> +<dt>Date</dt> <dd>2011-01-12 12:44:21 +0100 (Wed, 12 Jan 2011)</dd> +</dl> + +<h3>Log Message</h3> +<pre>Import my changes + rda's style</pre> + +<h3>Modified Paths</h3> +<ul> +<li><a href="#build_systemwebindexphp">build_system/web/index.php</a></li> +</ul> + +</div> +<div id="patch"><pre> +<a id="build_systemwebindexphp">Modified: build_system/web/index.php</a> +=================================================================== +--- build_system/web/index.php 2011-01-12 11:42:10 UTC (rev 268) ++++ build_system/web/index.php 2011-01-12 11:44:21 UTC (rev 269) +@@ -12,16 +12,27 @@ + + $upload_dir = "/home/schedbot/uploads"; + $max_modified = 2; +-$title = "Mageia build system"; ++$title = "Mageia build system status"; ++$tz = new DateTimeZone("UTC"); + ++# Temporary until initial mirror is ready ++$nb_rpm = shell_exec('rpm -qp --qf "%{SOURCERPM}\n" /distrib/bootstrap/distrib/cauldron/i586/media/core/release/*.rpm | sort -u | tee src.txt | wc -l'); ++$nb_rpm_mga = shell_exec('grep mga src.txt | tee src.mga.txt | wc -l'); ++shell_exec('grep -v mga src.txt > src.mdv.txt'); ++######################################### ++ + chdir($upload_dir); +-$all_files = shell_exec("find \( -name '*.rpm' -o -name '*.src.rpm.info' -o -name '*.youri' -o -name '*.lock' \) ! -ctime $max_modified"); + +-preg_match_all("!^\./(\w+)/((\w+)/(\w+)/(\w+)/(\d+)\.(\w+)\.(\w+)\.(\d+))_?(.+)(\.src\.rpm(?:\.info)?|\.youri|\.lock)$!m", $all_files, $matches, PREG_SET_ORDER); ++$all_files = shell_exec("find \( -name '*.rpm' -o -name '*.src.rpm.info' -o -name '*.youri' -o -name '*.lock' -o -name '*.done' \) ! -ctime $max_modified"); + ++preg_match_all("!^\./(\w+)/((\w+)/(\w+)/(\w+)/(\d+)\.(\w+)\.(\w+)\.(\d+))_?(.+)(\.src\.rpm(?:\.info)?|\.youri|\.lock|\.done)$!m", $all_files, $matches, PREG_SET_ORDER); ++ + $pkgs = array(); + foreach ($matches as $val) { +- $key = $val[6]; ++ if ($_GET["user"] && ($_GET["user"] != $val[7])) { ++ continue; ++ } ++ $key = $val[6] . $val[7]; + if (!is_array($pkgs[$key])) { + $pkgs[$key] = array(); + $pkgs[$key]["status"] = array(); +@@ -35,8 +46,8 @@ + } + + $status = $val[1]; +- $pkgs[$key]["status"][$status] = 1; + $data = $val[10]; ++ $pkgs[$key]["status"][$status] = $data; + $ext = $val[11]; + if ($ext == ".src.rpm.info") { + preg_match("!^(?:@\d+:)?(.*)!", $data, $name); +@@ -46,8 +57,9 @@ + } else if ($ext == ".youri") { + $pkgs[$key]["status"]["youri"] = 1; + } else if ($ext == ".lock") { ++ preg_match("/(.*)\..*\.(.*)\.\d+\.\d+/", "(\1@\2)", $data); + // parse build bot from $data +- $pkgs[$key]["status"]["build"] = 1; ++ $pkgs[$key]["status"]["build"] = $data; + } + } + // sort by key in reverse order to have more recent pkgs first +@@ -58,27 +70,33 @@ + <head> + <title><? echo $title ?></title> + <style type="text/css"> +-td.todo { +- color: black; ++table { ++ border-spacing: 0; ++ font-family: Helvetica; font-size: 80%; ++ border: 1px solid #ccc; + } +-td.building { +- color: fuchsia; +-} +-td.partial { +- color: purple; +-} +-td.built { +- color: blue; +-} +-td.youri { +- color: olive +-} +-td.uploaded { +- color: green; +-} +-td.failure, td.failure a, td.rejected, td.rejected a { +- color: red; +-} ++table tr { padding: 0; margin: 0; } ++table th { padding: 0.2em 0.5em; margin: 0; border-bottom: 2px solid #ccc; border-right: 1px solid #ccc; } ++table td { padding: 0; margin: 0; padding: 0.2em 0.5em; border-bottom: 1px solid #ccc; } ++ ++tr { background: transparent; } ++tr.uploaded { background: #ddffdd; } ++tr.failure, tr.rejected { background: #ffdddd; } ++tr.todo { background: white; } ++tr.building { background: #ffffdd; } ++tr.partial { background: blue; } ++tr.built { background: #00CCFF; } ++tr.youri { background: olive; } ++ ++td.status-box { width: 1em; height: 1em; } ++tr.uploaded td.status-box { background: green; } ++tr.failure td.status-box, tr.rejected td.status-box { background: red; } ++tr.todo td.status-box { background: white; } ++tr.building td.status-box { background: yellow; } ++tr.partial td.status-box { background: blue; } ++tr.built td.status-box { background: #00CCFF; } ++tr.youri td.status-box { background: olive; } ++ + </style> + </head> + +@@ -107,26 +125,55 @@ + return "unknown"; + } + ++function plural($num) { ++ if ($num > 1) ++ return "s"; ++} ++ ++function key2date($key) { ++ global $tz; ++ $date = DateTime::createFromFormat("YmdHis", $key+0, $tz); ++ $diff = time() - $date->getTimestamp(); ++ if ($diff<60) ++ return $diff . " second" . plural($diff) . " ago"; ++ $diff = round($diff/60); ++ if ($diff<60) ++ return $diff . " minute" . plural($diff) . " ago"; ++ $diff = round($diff/60); ++ if ($diff<24) ++ return $diff . " hour" . plural($diff) . " ago"; ++ $diff = round($diff/24); ++ return $diff . " day" . plural($diff) . " ago"; ++} ++ ++# Temporary until initial mirror is ready ++echo "<a href=\"src.mga.txt\">$nb_rpm_mga src.rpm</a> rebuilt for Mageia out of <a href=\"src.txt\">$nb_rpm</a>. <a href=\"src.mdv.txt\">List of Mandriva packages still present</a>.<br/>\n"; ++######################################### ++ ++echo "<tr><th>Submitted</th><th>User</th><th>Package</th><th>Target</th><th>Media</th><th colspan=\"2\">Status</th></tr>\n"; + foreach ($pkgs as $key => $p) { + $p["type"] = pkg_gettype(&$p); +- echo "<tr>\n"; +- echo "<td>" . $p["user"] . "</td>\n"; ++ echo "<tr class=" . $p["type"] . ">\n"; ++ echo "<td>" . key2date($key) . "</td>\n"; ++ echo "<td><a href='?user=" . $p["user"] . "'>" . $p["user"] . "</a></td>\n"; + echo "<td>" . $p["package"] . "</td>\n"; + echo "<td>" . $p["version"] . "</td>\n"; + echo "<td>" . $p["media"] . "/" . $p["section"] . "</td>\n"; ++ echo "<td class='status-box' />\n"; + $typelink = ""; + if ($p["type"] == "failure") { + $typelink = "/uploads/" . $p["type"] . "/" . $p["path"]; + } else if ($p["type"] == "rejected") { + $typelink = "/uploads/" . $p["type"] . "/" . $p["path"] . ".youri"; + } +- echo "<td class='" . $p["type"] . "'>"; ++ echo "<td>"; + if ($typelink) + echo "<a href='$typelink'>"; + echo $p["type"]; + if ($typelink) + echo "</a>"; +- echo "</td>\n";; ++ } ++ echo "</td>\n"; + echo "</tr>\n"; + } + ?> + +</pre></div> + +</body> +</html>
\ No newline at end of file diff --git a/zarb-ml/mageia-sysadm/attachments/20110112/872f6ea4/attachment.html b/zarb-ml/mageia-sysadm/attachments/20110112/872f6ea4/attachment.html new file mode 100644 index 000000000..ad8f1dc2e --- /dev/null +++ b/zarb-ml/mageia-sysadm/attachments/20110112/872f6ea4/attachment.html @@ -0,0 +1,235 @@ +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" +"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd"> +<html xmlns="http://www.w3.org/1999/xhtml"> +<head><meta http-equiv="content-type" content="text/html; charset=utf-8" /> +<title>[269] Import my changes + rda's style</title> +</head> +<body> + +<style type="text/css"><!-- +#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; } +#msg dl.meta dt { float: left; width: 6em; font-weight: bold; } +#msg dt:after { content:':';} +#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; } +#msg dl a { font-weight: bold} +#msg dl a:link { color:#fc3; } +#msg dl a:active { color:#ff0; } +#msg dl a:visited { color:#cc6; } +h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; } +#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; } +#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; } +#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; } +#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; } +#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; } +#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; } +#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; } +#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; } +#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; } +#logmsg pre { background: #eee; padding: 1em; } +#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;} +#logmsg dl { margin: 0; } +#logmsg dt { font-weight: bold; } +#logmsg dd { margin: 0; padding: 0 0 0.5em 0; } +#logmsg dd:before { content:'\00bb';} +#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; } +#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; } +#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; } +#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; } +#logmsg table th.Corner { text-align: left; } +#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; } +#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; } +#patch { width: 100%; } +--></style> +<div id="msg"> +<dl class="meta"> +<dt>Revision</dt> <dd>269</dd> +<dt>Author</dt> <dd>pterjan</dd> +<dt>Date</dt> <dd>2011-01-12 12:44:21 +0100 (Wed, 12 Jan 2011)</dd> +</dl> + +<h3>Log Message</h3> +<pre>Import my changes + rda's style</pre> + +<h3>Modified Paths</h3> +<ul> +<li><a href="#build_systemwebindexphp">build_system/web/index.php</a></li> +</ul> + +</div> +<div id="patch"><pre> +<a id="build_systemwebindexphp">Modified: build_system/web/index.php</a> +=================================================================== +--- build_system/web/index.php 2011-01-12 11:42:10 UTC (rev 268) ++++ build_system/web/index.php 2011-01-12 11:44:21 UTC (rev 269) +@@ -12,16 +12,27 @@ + + $upload_dir = "/home/schedbot/uploads"; + $max_modified = 2; +-$title = "Mageia build system"; ++$title = "Mageia build system status"; ++$tz = new DateTimeZone("UTC"); + ++# Temporary until initial mirror is ready ++$nb_rpm = shell_exec('rpm -qp --qf "%{SOURCERPM}\n" /distrib/bootstrap/distrib/cauldron/i586/media/core/release/*.rpm | sort -u | tee src.txt | wc -l'); ++$nb_rpm_mga = shell_exec('grep mga src.txt | tee src.mga.txt | wc -l'); ++shell_exec('grep -v mga src.txt > src.mdv.txt'); ++######################################### ++ + chdir($upload_dir); +-$all_files = shell_exec("find \( -name '*.rpm' -o -name '*.src.rpm.info' -o -name '*.youri' -o -name '*.lock' \) ! -ctime $max_modified"); + +-preg_match_all("!^\./(\w+)/((\w+)/(\w+)/(\w+)/(\d+)\.(\w+)\.(\w+)\.(\d+))_?(.+)(\.src\.rpm(?:\.info)?|\.youri|\.lock)$!m", $all_files, $matches, PREG_SET_ORDER); ++$all_files = shell_exec("find \( -name '*.rpm' -o -name '*.src.rpm.info' -o -name '*.youri' -o -name '*.lock' -o -name '*.done' \) ! -ctime $max_modified"); + ++preg_match_all("!^\./(\w+)/((\w+)/(\w+)/(\w+)/(\d+)\.(\w+)\.(\w+)\.(\d+))_?(.+)(\.src\.rpm(?:\.info)?|\.youri|\.lock|\.done)$!m", $all_files, $matches, PREG_SET_ORDER); ++ + $pkgs = array(); + foreach ($matches as $val) { +- $key = $val[6]; ++ if ($_GET["user"] && ($_GET["user"] != $val[7])) { ++ continue; ++ } ++ $key = $val[6] . $val[7]; + if (!is_array($pkgs[$key])) { + $pkgs[$key] = array(); + $pkgs[$key]["status"] = array(); +@@ -35,8 +46,8 @@ + } + + $status = $val[1]; +- $pkgs[$key]["status"][$status] = 1; + $data = $val[10]; ++ $pkgs[$key]["status"][$status] = $data; + $ext = $val[11]; + if ($ext == ".src.rpm.info") { + preg_match("!^(?:@\d+:)?(.*)!", $data, $name); +@@ -46,8 +57,9 @@ + } else if ($ext == ".youri") { + $pkgs[$key]["status"]["youri"] = 1; + } else if ($ext == ".lock") { ++ preg_match("/(.*)\..*\.(.*)\.\d+\.\d+/", "(\1@\2)", $data); + // parse build bot from $data +- $pkgs[$key]["status"]["build"] = 1; ++ $pkgs[$key]["status"]["build"] = $data; + } + } + // sort by key in reverse order to have more recent pkgs first +@@ -58,27 +70,33 @@ + <head> + <title><? echo $title ?></title> + <style type="text/css"> +-td.todo { +- color: black; ++table { ++ border-spacing: 0; ++ font-family: Helvetica; font-size: 80%; ++ border: 1px solid #ccc; + } +-td.building { +- color: fuchsia; +-} +-td.partial { +- color: purple; +-} +-td.built { +- color: blue; +-} +-td.youri { +- color: olive +-} +-td.uploaded { +- color: green; +-} +-td.failure, td.failure a, td.rejected, td.rejected a { +- color: red; +-} ++table tr { padding: 0; margin: 0; } ++table th { padding: 0.2em 0.5em; margin: 0; border-bottom: 2px solid #ccc; border-right: 1px solid #ccc; } ++table td { padding: 0; margin: 0; padding: 0.2em 0.5em; border-bottom: 1px solid #ccc; } ++ ++tr { background: transparent; } ++tr.uploaded { background: #ddffdd; } ++tr.failure, tr.rejected { background: #ffdddd; } ++tr.todo { background: white; } ++tr.building { background: #ffffdd; } ++tr.partial { background: blue; } ++tr.built { background: #00CCFF; } ++tr.youri { background: olive; } ++ ++td.status-box { width: 1em; height: 1em; } ++tr.uploaded td.status-box { background: green; } ++tr.failure td.status-box, tr.rejected td.status-box { background: red; } ++tr.todo td.status-box { background: white; } ++tr.building td.status-box { background: yellow; } ++tr.partial td.status-box { background: blue; } ++tr.built td.status-box { background: #00CCFF; } ++tr.youri td.status-box { background: olive; } ++ + </style> + </head> + +@@ -107,26 +125,55 @@ + return "unknown"; + } + ++function plural($num) { ++ if ($num > 1) ++ return "s"; ++} ++ ++function key2date($key) { ++ global $tz; ++ $date = DateTime::createFromFormat("YmdHis", $key+0, $tz); ++ $diff = time() - $date->getTimestamp(); ++ if ($diff<60) ++ return $diff . " second" . plural($diff) . " ago"; ++ $diff = round($diff/60); ++ if ($diff<60) ++ return $diff . " minute" . plural($diff) . " ago"; ++ $diff = round($diff/60); ++ if ($diff<24) ++ return $diff . " hour" . plural($diff) . " ago"; ++ $diff = round($diff/24); ++ return $diff . " day" . plural($diff) . " ago"; ++} ++ ++# Temporary until initial mirror is ready ++echo "<a href=\"src.mga.txt\">$nb_rpm_mga src.rpm</a> rebuilt for Mageia out of <a href=\"src.txt\">$nb_rpm</a>. <a href=\"src.mdv.txt\">List of Mandriva packages still present</a>.<br/>\n"; ++######################################### ++ ++echo "<tr><th>Submitted</th><th>User</th><th>Package</th><th>Target</th><th>Media</th><th colspan=\"2\">Status</th></tr>\n"; + foreach ($pkgs as $key => $p) { + $p["type"] = pkg_gettype(&$p); +- echo "<tr>\n"; +- echo "<td>" . $p["user"] . "</td>\n"; ++ echo "<tr class=" . $p["type"] . ">\n"; ++ echo "<td>" . key2date($key) . "</td>\n"; ++ echo "<td><a href='?user=" . $p["user"] . "'>" . $p["user"] . "</a></td>\n"; + echo "<td>" . $p["package"] . "</td>\n"; + echo "<td>" . $p["version"] . "</td>\n"; + echo "<td>" . $p["media"] . "/" . $p["section"] . "</td>\n"; ++ echo "<td class='status-box' />\n"; + $typelink = ""; + if ($p["type"] == "failure") { + $typelink = "/uploads/" . $p["type"] . "/" . $p["path"]; + } else if ($p["type"] == "rejected") { + $typelink = "/uploads/" . $p["type"] . "/" . $p["path"] . ".youri"; + } +- echo "<td class='" . $p["type"] . "'>"; ++ echo "<td>"; + if ($typelink) + echo "<a href='$typelink'>"; + echo $p["type"]; + if ($typelink) + echo "</a>"; +- echo "</td>\n";; ++ } ++ echo "</td>\n"; + echo "</tr>\n"; + } + ?> + +</pre></div> + +</body> +</html>
\ No newline at end of file |