| 1 |
slords |
1.1 |
Add a "repowait" stage right after "add_to_repo", so a package job |
| 2 |
|
|
can request_copy only once and nothing executes add_to_repo more than |
| 3 |
|
|
once. |
| 4 |
|
|
|
| 5 |
|
|
diff -Nur plague-0.4.4.1-orig/server/PackageJob.py plague-0.4.4.1/server/PackageJob.py |
| 6 |
|
|
--- plague-0.4.4.1-orig/server/PackageJob.py 2006-03-13 05:10:49.000000000 +0100 |
| 7 |
|
|
+++ plague-0.4.4.1/server/PackageJob.py 2008-01-18 13:40:29.000000000 +0100 |
| 8 |
|
|
@@ -87,7 +87,7 @@ |
| 9 |
|
|
|
| 10 |
|
|
def is_package_job_stage_valid(stage): |
| 11 |
|
|
""" Validate a job stage """ |
| 12 |
|
|
- stages = ['initialize', 'checkout_wait', 'checkout_wait_done', 'checkout', 'make_srpm', 'prep', 'waiting', 'building', 'build_done', 'add_to_repo', 'repodone', 'needsign', 'failed', 'finished'] |
| 13 |
|
|
+ stages = ['initialize', 'checkout_wait', 'checkout_wait_done', 'checkout', 'make_srpm', 'prep', 'waiting', 'building', 'build_done', 'add_to_repo', 'repowait', 'repodone', 'needsign', 'failed', 'finished'] |
| 14 |
|
|
if stage in stages: |
| 15 |
|
|
return True |
| 16 |
|
|
return False |
| 17 |
|
|
@@ -615,6 +615,7 @@ |
| 18 |
|
|
self._set_cur_stage('repodone') |
| 19 |
|
|
else: |
| 20 |
|
|
self._set_cur_stage('add_to_repo') |
| 21 |
|
|
+ self.endtime = time.time() |
| 22 |
|
|
return False # Don't want to wait |
| 23 |
|
|
|
| 24 |
|
|
return True |
| 25 |
|
|
@@ -687,9 +688,13 @@ |
| 26 |
|
|
# list from this object directly when the copy operation |
| 27 |
|
|
# happens |
| 28 |
|
|
if len(self.repofiles): |
| 29 |
|
|
+ self.endtime = time.time() |
| 30 |
|
|
+ self._set_cur_stage('repowait') |
| 31 |
|
|
self.repo.request_copy(self) |
| 32 |
|
|
|
| 33 |
|
|
- self.endtime = time.time() |
| 34 |
|
|
+ return False |
| 35 |
|
|
+ |
| 36 |
|
|
+ def _stage_repowait(self): |
| 37 |
|
|
return True |
| 38 |
|
|
|
| 39 |
|
|
def repo_add_callback(self, success, bad_file=None): |
| 40 |
|
|
diff -Nur plague-0.4.4.1-orig/www/css/style.css plague-0.4.4.1/www/css/style.css |
| 41 |
|
|
--- plague-0.4.4.1-orig/www/css/style.css 2005-08-06 18:06:41.000000000 +0200 |
| 42 |
|
|
+++ plague-0.4.4.1/www/css/style.css 2008-01-18 13:13:20.000000000 +0100 |
| 43 |
|
|
@@ -201,6 +201,12 @@ |
| 44 |
|
|
font-size: 12px; |
| 45 |
|
|
} |
| 46 |
|
|
|
| 47 |
|
|
+font.status-repowait { |
| 48 |
|
|
+ color: #aaaa00; |
| 49 |
|
|
+ font-weight: bold; |
| 50 |
|
|
+ font-size: 12px; |
| 51 |
|
|
+} |
| 52 |
|
|
+ |
| 53 |
|
|
font.status-needsign { |
| 54 |
|
|
color: #00aa00; |
| 55 |
|
|
font-weight: bold; |
| 56 |
|
|
diff -Nur plague-0.4.4.1-orig/www/indiv.psp plague-0.4.4.1/www/indiv.psp |
| 57 |
|
|
--- plague-0.4.4.1-orig/www/indiv.psp 2005-08-31 21:31:00.000000000 +0200 |
| 58 |
|
|
+++ plague-0.4.4.1/www/indiv.psp 2008-01-18 03:29:07.000000000 +0100 |
| 59 |
|
|
@@ -59,7 +59,7 @@ |
| 60 |
|
|
# default cutoff is 1 day |
| 61 |
|
|
cutoff_time = 86400 |
| 62 |
|
|
|
| 63 |
|
|
- status_list = ['ALL', 'waiting', 'building', 'add_to_repo', 'needsign', 'failed', 'success'] |
| 64 |
|
|
+ status_list = ['ALL', 'waiting', 'building', 'add_to_repo', 'repowait', 'needsign', 'failed', 'success'] |
| 65 |
|
|
%> |
| 66 |
|
|
|
| 67 |
|
|
<center> |
| 68 |
|
|
diff -Nur plague-0.4.4.1-orig/www/success.psp plague-0.4.4.1/www/success.psp |
| 69 |
|
|
--- plague-0.4.4.1-orig/www/success.psp 2005-08-31 21:31:00.000000000 +0200 |
| 70 |
|
|
+++ plague-0.4.4.1/www/success.psp 2008-01-18 14:03:07.000000000 +0100 |
| 71 |
|
|
@@ -10,7 +10,7 @@ |
| 72 |
|
|
try: |
| 73 |
|
|
# show any jobs that have successfully built |
| 74 |
|
|
args = {} |
| 75 |
|
|
- args['status'] = ['add_to_repo', 'needsign', 'repodone'] |
| 76 |
|
|
+ args['status'] = ['add_to_repo', 'needsign', 'repowait', 'repodone'] |
| 77 |
|
|
args['orderby'] = ['status', 'endtime desc'] |
| 78 |
|
|
args['maxrows'] = 100 |
| 79 |
|
|
(e, msg, jobs) = server.list_jobs(args) |
Parent Directory
| 
Revision Log
| 
Revision Graph
