Author: arekm Date: Fri Jun 27 17:21:40 2008 GMT
Module: pld-builder.new Tag: HEAD
---- Log message:
Back to old style (lower priority means more important). High priority tasks
are now tasks with priority < 0.
---- Files affected:
pld-builder.new:
jak-to-dziala.txt (1.4 -> 1.5)
pld-builder.new/PLD_Builder:
srpm_builder.py (1.49 -> 1.50) , rpm_builder.py (1.58 -> 1.59)
---- Diffs:
================================================================
Index: pld-builder.new/jak-to-dziala.txt
diff -u pld-builder.new/jak-to-dziala.txt:1.4
pld-builder.new/jak-to-dziala.txt:1.5
--- pld-builder.new/jak-to-dziala.txt:1.4 Fri Jun 27 18:42:53 2008
+++ pld-builder.new/jak-to-dziala.txt Fri Jun 27 19:21:35 2008
@@ -21,7 +21,7 @@
3. Na koncie srpm buildera z crona chodzi skrypt srpm_builder.py.
a) Czyta spool/queue, je�li s� tam jakie� zlecenia, sortuje wg. priorytetu
- (wy�szy numer == wa�niejsze zlecenie), a nast�pnie sortuje wg. czasu
+ (ni�szy numer == wa�niejsze zlecenie), a nast�pnie sortuje wg. czasu
przybycia zlecenia (starsze == wa�niejsze), wyci�ga je z kolejki i
zapisuje
kolejk�.
b) Obs�uguje tylko <group ...>.
@@ -88,7 +88,7 @@
c) lockowanie building-rpm-for-<builder> (tylko jeden build w chroot
na raz)
d) Czyta spool/queue, je�li s� tam jakie� zlecenia, sortuje wg. priorytetu
- (wy�szy numer == wa�niejsze zlecenie), a nast�pnie sortuje wg. czasu
+ (ni�szy numer == wa�niejsze zlecenie), a nast�pnie sortuje wg. czasu
przybycia zlecenia (starsze == wa�niejsze), wyci�ga je z kolejki i
zapisuje
kolejk�.
e) buduje pakiety, wrzuca pliki do spool/{buildlogs,ftp}. Je�li nie ma flagi
================================================================
Index: pld-builder.new/PLD_Builder/srpm_builder.py
diff -u pld-builder.new/PLD_Builder/srpm_builder.py:1.49
pld-builder.new/PLD_Builder/srpm_builder.py:1.50
--- pld-builder.new/PLD_Builder/srpm_builder.py:1.49 Fri Jun 27 18:42:53 2008
+++ pld-builder.new/PLD_Builder/srpm_builder.py Fri Jun 27 19:21:35 2008
@@ -34,7 +34,7 @@
if pri_diff == 0:
return cmp(r1.time, r2.time)
else:
- return -pri_diff
+ return pri_diff
q.requests.sort(mycmp)
ret = q.requests[0]
q.requests = q.requests[1:]
================================================================
Index: pld-builder.new/PLD_Builder/rpm_builder.py
diff -u pld-builder.new/PLD_Builder/rpm_builder.py:1.58
pld-builder.new/PLD_Builder/rpm_builder.py:1.59
--- pld-builder.new/PLD_Builder/rpm_builder.py:1.58 Fri Jun 27 18:59:05 2008
+++ pld-builder.new/PLD_Builder/rpm_builder.py Fri Jun 27 19:21:35 2008
@@ -47,7 +47,7 @@
if pri_diff == 0:
return cmp(r1.time, r2.time)
else:
- return -pri_diff
+ return pri_diff
q.requests.sort(mycmp)
ret = q.requests[0]
return ret
@@ -212,8 +212,8 @@
req = pick_request(q)
q.unlock()
- # high priority tasks have priority >= 1000
- if req.priority < 1000:
+ # high priority tasks have priority < 0
+ if req.priority < 0:
# allow only one build in given builder at once
if not lock.lock("building-rpm-for-%s" % config.builder, non_block =
1):
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/pld-builder.new/jak-to-dziala.txt?r1=1.4&r2=1.5&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/pld-builder.new/PLD_Builder/srpm_builder.py?r1=1.49&r2=1.50&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/pld-builder.new/PLD_Builder/rpm_builder.py?r1=1.58&r2=1.59&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
