phase1: remove 'cleanup' worker option (always set)

Signed-off-by: Thibaut VARÈNE <hacks@slashdirt.org>

diff --git a/phase1/config.ini.example b/phase1/config.ini.example
index a006b561d13e1d899cf2435049b84cd455352b45..d65c8230c7fd0b2cd52cf748d7352b5bbd28a9be 100644 (file)
--- a/phase1/config.ini.example
+++ b/phase1/config.ini.example
@@ -57,4 +57,3 @@ password = example
 phase = 1
 name = example-worker-2
 password = example2
-cleanup = 1

diff --git a/phase1/master.cfg b/phase1/master.cfg
index f6e752f5723572d2d6ae4bc357f1e4aa2a5aa0e4..09d3cd424c67820445e81ad87c9eb0b80f31d333 100644 (file)
--- a/phase1/master.cfg
+++ b/phase1/master.cfg
@@ -90,11 +90,9 @@ for section in ini.sections():
        if section.startswith("worker "):
                if ini.has_option(section, "name") and ini.has_option(section, "password") and \
                   (not ini.has_option(section, "phase") or ini.getint(section, "phase") == 1):
-                       sl_props = { 'dl_lock':None, 'ul_lock':None, 'do_cleanup':False }
+                       sl_props = { 'dl_lock':None, 'ul_lock':None }
                        name = ini.get(section, "name")
                        password = ini.get(section, "password")
-                       if ini.has_option(section, "cleanup"):
-                               sl_props['do_cleanup'] = ini.getboolean(section, "cleanup")
                        if ini.has_option(section, "dl_lock"):
                                lockname = ini.get(section, "dl_lock")
                                sl_props['dl_lock'] = lockname
@@ -561,7 +559,7 @@ for target in targets:
                repourl = repo_url,
                branch = repo_branch,
                mode = 'full',
-               method = Interpolate("%(prop:do_cleanup:#?|fresh|clean)s"),
+               method = 'fresh',
                locks = NetLockDl,
                haltOnFailure = True,
        ))