| 1 |
commit: b568e1b218a2ed83dc0ae36bb4a3326b19078034 |
| 2 |
Author: André Erdmann <dywi <AT> mailerd <DOT> de> |
| 3 |
AuthorDate: Tue Jul 24 16:58:09 2012 +0000 |
| 4 |
Commit: André Erdmann <dywi <AT> mailerd <DOT> de> |
| 5 |
CommitDate: Tue Jul 24 16:58:09 2012 +0000 |
| 6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/R_overlay.git;a=commit;h=b568e1b2 |
| 7 |
|
| 8 |
stop thread when queue is empty |
| 9 |
|
| 10 |
--- |
| 11 |
roverlay/overlay/category.py | 25 ++++++++++++------------- |
| 12 |
1 files changed, 12 insertions(+), 13 deletions(-) |
| 13 |
|
| 14 |
diff --git a/roverlay/overlay/category.py b/roverlay/overlay/category.py |
| 15 |
index a0b1607..2d66246 100644 |
| 16 |
--- a/roverlay/overlay/category.py |
| 17 |
+++ b/roverlay/overlay/category.py |
| 18 |
@@ -145,19 +145,18 @@ class Category ( object ): |
| 19 |
* q -- queue |
| 20 |
* write_kw -- keywords for write(...) |
| 21 |
""" |
| 22 |
- try: |
| 23 |
- while not q.empty(): |
| 24 |
- try: |
| 25 |
- pkg = q.get_nowait() |
| 26 |
- # remove manifest writing from threaded writing since it's |
| 27 |
- # single-threaded |
| 28 |
- pkg.write ( write_manifest=False, **write_kw ) |
| 29 |
- #except ( Exception, KeyboardInterrupt ) as e: |
| 30 |
- except Exception as e: |
| 31 |
- # FIXME: reintroduce RERAISE |
| 32 |
- self.logger.exception ( e ) |
| 33 |
- except queue.Empty: |
| 34 |
- pass |
| 35 |
+ while not q.empty(): |
| 36 |
+ try: |
| 37 |
+ pkg = q.get_nowait() |
| 38 |
+ # remove manifest writing from threaded writing since it's |
| 39 |
+ # single-threaded |
| 40 |
+ pkg.write ( write_manifest=False, **write_kw ) |
| 41 |
+ except queue.Empty: |
| 42 |
+ break |
| 43 |
+ #except ( Exception, KeyboardInterrupt ) as e: |
| 44 |
+ except Exception as e: |
| 45 |
+ # FIXME: reintroduce RERAISE |
| 46 |
+ self.logger.exception ( e ) |
| 47 |
# --- end of run_write_queue (...) --- |
| 48 |
|
| 49 |
if len ( self._subdirs ) == 0: return |
Archives