[Piuparts-commits] [SCM] piuparts git repository branch, piatti, updated. 0.44-755-ga3ab31d

[Andreas Beckmann]

The following commit has been merged in the piatti branch:
commit b85ff92c7451dbebf8aa64fa445e929e4baf8aa9
Author: Andreas Beckmann <debian at abeckmann.de>
Date:   Mon Jun 18 00:35:22 2012 +0200

    p-s: allow section specific master paramaters
    
    Signed-off-by: Andreas Beckmann <debian at abeckmann.de>

diff --git a/piuparts-slave.py b/piuparts-slave.py
index 72411de..65090ee 100644
--- a/piuparts-slave.py
+++ b/piuparts-slave.py
@@ -271,12 +271,13 @@ class Section:
                 os.mkdir(rdir)
 
         self._slave = Slave()
-        self._slave.set_master_host(self._global_config["master-host"])
-        self._slave.set_master_user(self._global_config["master-user"])
-        self._slave.set_master_directory(self._global_config["master-directory"])
-        self._slave.set_master_command(self._global_config["master-command"] + " " + self._config.section)
-        self._log_file=self._config["log-file"]
 
+    def _connect_to_master(self):
+        self._slave.set_master_host(self._config["master-host"])
+        self._slave.set_master_user(self._config["master-user"])
+        self._slave.set_master_directory(self._config["master-directory"])
+        self._slave.set_master_command(self._config["master-command"] + " " + self._config.section)
+        self._slave.connect_to_master(self._config["log-file"])
 
     def _check_tarball(self):
         oldcwd = os.getcwd()
@@ -340,7 +341,7 @@ class Section:
                 return 0
 
         try:
-            self._slave.connect_to_master(self._log_file)
+            self._connect_to_master()
         except KeyboardInterrupt:
             raise
         except MasterIsBusy:

-- 
piuparts git repository