diff options
Diffstat (limited to 'zarb-ml/mageia-sysadm/attachments/20110118/cf616b24/attachment.html')
| -rw-r--r-- | zarb-ml/mageia-sysadm/attachments/20110118/cf616b24/attachment.html | 130 |
1 files changed, 130 insertions, 0 deletions
diff --git a/zarb-ml/mageia-sysadm/attachments/20110118/cf616b24/attachment.html b/zarb-ml/mageia-sysadm/attachments/20110118/cf616b24/attachment.html new file mode 100644 index 000000000..b52491dab --- /dev/null +++ b/zarb-ml/mageia-sysadm/attachments/20110118/cf616b24/attachment.html @@ -0,0 +1,130 @@ +<!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>[313] Fixes</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>313</dd> +<dt>Author</dt> <dd>pterjan</dd> +<dt>Date</dt> <dd>2011-01-18 13:43:53 +0100 (Tue, 18 Jan 2011)</dd> +</dl> + +<h3>Log Message</h3> +<pre>Fixes</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-17 17:24:15 UTC (rev 312) ++++ build_system/web/index.php 2011-01-18 12:43:53 UTC (rev 313) +@@ -46,7 +46,7 @@ + + chdir($upload_dir); + +-$all_files = shell_exec("find \( -name '*.rpm' -o -name '*.src.rpm.info' -o -name '*.youri' -o -name '*.lock' -o -name '*.done' \) ! -ctime $max_modified -printf \"%p\t%T@\""); ++$all_files = shell_exec("find \( -name '*.rpm' -o -name '*.src.rpm.info' -o -name '*.youri' -o -name '*.lock' -o -name '*.done' \) ! -ctime $max_modified -printf \"%p\t%T@\\n\""); + $re = "!^\./(\w+)/((\w+)/(\w+)/(\w+)/(\d+)\.(\w+)\.(\w+)\.(\d+))_?(.+)(\.src\.rpm(?:\.info)?|\.youri|\.lock|\.done)\s+(\d+\.\d+)$!m"; + $r = preg_match_all($re, + $all_files, +@@ -89,7 +89,7 @@ + // parse build bot from $data + $pkgs[$key]['status']['build'] = 1; + } else if ($ext == '.done') { +- $pkgs[$key]['buildtime']['start'] = strtotime($val[6]); ++ $pkgs[$key]['buildtime']['start'] = key2timestamp($val[6]); + $pkgs[$key]['buildtime']['end'] = round($val[12]); + $pkgs[$key]['buildtime']['diff'] = $pkgs[$key]['buildtime']['end'] - $pkgs[$key]['buildtime']['start']; + } +@@ -133,6 +133,24 @@ + } + + /** ++ * Return timestamp from package key ++ * @param string $key package submission key ++ * ++ * @return integer ++*/ ++ ++function key2timestamp($key) { ++ global $tz; ++ ++ $date = DateTime::createFromFormat("YmdHis", $key+0, $tz); ++ if ($date <= 0) ++ return null; ++ ++ return $date->getTimestamp(); ++} ++ ++function key2date($key, $diff = null) { ++/** + * Return human-readable time difference: + * - against $key (YmdHis expected format) + * - using only $diff (takes precedence over $key if provided) +@@ -142,15 +160,14 @@ + * + * @return string + */ +-function key2date($key, $diff = null) { + global $tz; + + if (is_null($diff) || $diff <= 0) { +- $date = DateTime::createFromFormat("YmdHis", $key+0, $tz); +- if ($date <= 0) ++ $t = key2timestamp($key); ++ if (is_null($t)) + return null; + +- $diff = time() - $date->getTimestamp(); ++ $diff = time() - $t; + } + if ($diff<60) + return $diff . " second" . plural($diff); + +</pre></div> + +</body> +</html>
\ No newline at end of file |