1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
|
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2//EN">
<HTML>
<HEAD>
<TITLE> [Mageia-sysadm] [313] Fixes
</TITLE>
<LINK REL="Index" HREF="index.html" >
<LINK REL="made" HREF="mailto:mageia-sysadm%40mageia.org?Subject=Re%3A%20%5BMageia-sysadm%5D%20%5B313%5D%20Fixes&In-Reply-To=%3C20110118124353.F1385428D3%40valstar.mageia.org%3E">
<META NAME="robots" CONTENT="index,nofollow">
<META http-equiv="Content-Type" content="text/html; charset=us-ascii">
<LINK REL="Previous" HREF="002179.html">
<LINK REL="Next" HREF="002181.html">
</HEAD>
<BODY BGCOLOR="#ffffff">
<H1>[Mageia-sysadm] [313] Fixes</H1>
<B>root at mageia.org</B>
<A HREF="mailto:mageia-sysadm%40mageia.org?Subject=Re%3A%20%5BMageia-sysadm%5D%20%5B313%5D%20Fixes&In-Reply-To=%3C20110118124353.F1385428D3%40valstar.mageia.org%3E"
TITLE="[Mageia-sysadm] [313] Fixes">root at mageia.org
</A><BR>
<I>Tue Jan 18 13:43:53 CET 2011</I>
<P><UL>
<LI>Previous message: <A HREF="002179.html">[Mageia-sysadm] [826] - seems I cannot use the variable in the template
</A></li>
<LI>Next message: <A HREF="002181.html">[Mageia-sysadm] [314] Better split of key2date
</A></li>
<LI> <B>Messages sorted by:</B>
<a href="date.html#2180">[ date ]</a>
<a href="thread.html#2180">[ thread ]</a>
<a href="subject.html#2180">[ subject ]</a>
<a href="author.html#2180">[ author ]</a>
</LI>
</UL>
<HR>
<!--beginarticle-->
<PRE>Revision: 313
Author: pterjan
Date: 2011-01-18 13:43:53 +0100 (Tue, 18 Jan 2011)
Log Message:
-----------
Fixes
Modified Paths:
--------------
build_system/web/index.php
Modified: build_system/web/index.php
===================================================================
--- 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);
-------------- next part --------------
An HTML attachment was scrubbed...
URL: </pipermail/mageia-sysadm/attachments/20110118/cf616b24/attachment.html>
</PRE>
<!--endarticle-->
<HR>
<P><UL>
<!--threads-->
<LI>Previous message: <A HREF="002179.html">[Mageia-sysadm] [826] - seems I cannot use the variable in the template
</A></li>
<LI>Next message: <A HREF="002181.html">[Mageia-sysadm] [314] Better split of key2date
</A></li>
<LI> <B>Messages sorted by:</B>
<a href="date.html#2180">[ date ]</a>
<a href="thread.html#2180">[ thread ]</a>
<a href="subject.html#2180">[ subject ]</a>
<a href="author.html#2180">[ author ]</a>
</LI>
</UL>
<hr>
<a href="https://www.mageia.org/mailman/listinfo/mageia-sysadm">More information about the Mageia-sysadm
mailing list</a><br>
</body></html>
|
