[Piuparts-commits] [SCM] piuparts git repository branch, piatti, updated. 0.44-836-g931cbb1

Andreas Beckmann debian at abeckmann.de
Thu Jun 21 11:36:33 UTC 2012


The following commit has been merged in the piatti branch:
commit 91d974c184615284b32b53b12a72724395b67b60
Author: Andreas Beckmann <debian at abeckmann.de>
Date:   Wed Jun 20 21:25:43 2012 +0200

    p-s: drop idle.stamp functionality
    
    this will be replaced by a master solution in the future
    
    Signed-off-by: Andreas Beckmann <debian at abeckmann.de>

diff --git a/debian/changelog b/debian/changelog
index 3284b2a..5d9a836 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -148,6 +148,7 @@ piuparts (0.45) UNRELEASED; urgency=low
     - Pass a version qualified package name (foo=1.2-3) to piuparts to ensure
       the correct package version gets tested.
     - Increase verboseness for untestable packages.
+    - Remove idle.stamp functionality.
   * piuparts-report.py:
     - Remove known_circular_depends handling.
     - Exclude obsolete states from generated report.
diff --git a/piuparts-slave.py b/piuparts-slave.py
index f2a31b8..e03dfdd 100644
--- a/piuparts-slave.py
+++ b/piuparts-slave.py
@@ -345,15 +345,6 @@ class Section:
         return ret
 
     def _run(self):
-        if os.path.exists("idle.stamp"):
-            statobj = os.stat("idle.stamp")
-            age = time.time() - statobj[stat.ST_MTIME]
-            ttl = int(self._config["idle-sleep"]) - age
-            if age >= 0 and ttl > 0:
-                logging.info("idle")
-                self._idle_wait_until = time.time() + ttl
-                return 0
-
         try:
             self._connect_to_master()
         except KeyboardInterrupt:
@@ -384,11 +375,7 @@ class Section:
 
         if not self._slave.get_reserved():
             self._idle_wait_until = time.time() + int(self._config["idle-sleep"])
-            create_file("idle.stamp", "%d" % time.time())
             return 0
-        else:
-            if os.path.exists("idle.stamp"):
-                os.unlink("idle.stamp")
 
         if self._config["distro"]:
             distros = [self._config["distro"]]

-- 
piuparts git repository



More information about the Piuparts-commits mailing list