* Job metadata:

 - "jobuilds" -> "atoms"
* autotua:
 - Fix bad bug where jobuild objects were created before the jobtage tree was exported
 - We can't parse jobuild src_uri before the objects are created => move to prepare()
 - Jobuild portconf will now be stored inside the jobtage tree
* autotua.fetch:
 - If a filename is omitted, assume basename(uri)
* autotua.chroot:
 - rename prepare() to setup() -- prepare() sounds like it's about to be ready for running jobs :P
* autotua.jobuild:
 - Read everything instead of just one line -- results of a single request will often be on multiple lines

1 files changed, 5 insertions, 5 deletions

diff --git a/slave/autotua/chroot/__init__.py b/slave/autotua/chroot/__init__.py
index 9d410af..25e5b7d 100644
--- a/slave/autotua/chroot/__init__.py
+++ b/slave/autotua/chroot/__init__.py
@@ -53,7 +53,7 @@ class PristineChroot(object):
             print "Chroot is once again pristine :)"
         return True
 
-    def prepare(self):
+    def setup(self):
         """Extract the chroot if required"""
         if osp.exists(self.dir):
             print "Pristine ready."
@@ -98,7 +98,7 @@ class WorkChroot(object):
                     return None
         return True
 
-    def _prepare_mounts(self, chrootdir=None):
+    def _setup_mounts(self, chrootdir=None):
         if not chrootdir:
             chrootdir = self.dir
         for dir in ['dev', 'sys']:
@@ -106,19 +106,19 @@ class WorkChroot(object):
         result = subprocess.check_call('mount -t proc proc "%s"' % osp.join(chrootdir, 'proc'), shell=True)
         result = subprocess.check_call('mount -o bind "%s" "%s"' % (const.PORTAGE_DIR, osp.join(chrootdir, 'usr', 'portage')), shell=True)
 
-    def prepare(self):
+    def setup(self):
         """
         Clean existing mounts, if any
         rsync from PristineChroot
         Mount stuff.
         """
-        if not self.pristine.prepare():
+        if not self.pristine.setup():
             return False
         self._clean_mounts()
         # self.chroot.dir/ => rsync *contents* to self.dir
         syncer = sync.Syncer(uri=self.pristine.dir+"/", destdir=self.dir, scheme='rsync')
         syncer.sync()
-        self._prepare_mounts()
+        self._setup_mounts()
         print "Work Chroot ready."
 
     def clean(self):