[Piuparts-commits] rev 357 - in trunk: . debian

[Holger Levsen]

Author: holger
Date: 2009-04-18 10:46:35 +0000 (Sat, 18 Apr 2009)
New Revision: 357

Modified:
   trunk/TODO
   trunk/debian/changelog
   trunk/piuparts-slave.py
Log:
  - allow the user to stop the slave with control-C.

Modified: trunk/TODO
===================================================================
--- trunk/TODO	2009-04-18 09:57:29 UTC (rev 356)
+++ trunk/TODO	2009-04-18 10:46:35 UTC (rev 357)
@@ -6,11 +6,9 @@
 - report:
  - find_log() is not used atm
  - refactor code, sources.txt should not be calculated where it currently is
- - include links to http://qa.debian.org/developer.php?login=$maintainer_email
  - include links to logfiles in source summary pages
 - slave
  - mention distro when sending logs
- - slave_stop script - unneeded with patch for #523958
 - then R
 - include patch for #519192
 - probably include patch for #523950
@@ -36,6 +34,8 @@
   - left-over processes (10.7.3)
   - unclassified
  - write stats for total number of logs (when a package has more than a log in fail/ or bugged/)
+ - include links to http://qa.debian.org/developer.php?login=$maintainer_email or probably
+   better: create maintainer centric pages.
  - RSS feeds of logs
 
 - expire old logs a month after sucessful testing

Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog	2009-04-18 09:57:29 UTC (rev 356)
+++ trunk/debian/changelog	2009-04-18 10:46:35 UTC (rev 357)
@@ -17,8 +17,8 @@
     - add advice how to read the logfile to the top of the logfiles produced.
     - add "FAIL: " to logging output for seven more failure types, so that it
       becomes easier to group failure causes.
-    - allow the user to stop it with control-C. Thanks to Carl Chenet for the
-      patch. (Closes: #523958)
+    - allow the user to stop piuparts with control-C. Thanks to Carl Chenet for
+      the patch. (Closes: #523958)
   * piupartslib/packagesdb.py:
     - change the test whether a package is testable to check whether the 
       package is of priority "required", and not whether it's "Essential".
@@ -31,6 +31,7 @@
     - support looping trough multiple sections in slave.conf via new config 
       value "sections". Thanks to Frank Ploss for writing this patch with me 
       and helping me understand the code much better!
+    - allow the user to stop the slave with control-C.
   * Re-add piuparts-reports.py which got removed/lost between 0.14 and 0.20 
     without changelog entry.
   * piuparts-reports.py: 

Modified: trunk/piuparts-slave.py
===================================================================
--- trunk/piuparts-slave.py	2009-04-18 09:57:29 UTC (rev 356)
+++ trunk/piuparts-slave.py	2009-04-18 10:46:35 UTC (rev 357)
@@ -442,4 +442,9 @@
 
 
 if __name__ == "__main__":
-    main()
+  try:
+     main()
+  except KeyboardInterrupt:
+     print ''
+     print 'Slave interrupted by the user, exiting... manual cleanup still neccessary.'
+     sys.exit(1)