]> git.apps.os.sepia.ceph.com Git - autobuild-ceph.git/commitdiff
fabfile.py: clear up confusion about location of branches-local
authorDan Mick <dan.mick@redhat.com>
Tue, 19 Jan 2016 00:20:01 +0000 (16:20 -0800)
committerDan Mick <dan.mick@redhat.com>
Tue, 19 Jan 2016 00:20:01 +0000 (16:20 -0800)
This only affects gitbuilders where branches-local is not
'branches-local' (namely samba)

Signed-off-by: Dan Mick <dan.mick@redhat.com>
fabfile.py

index bb2dd57f123a3e51c3e365236cdf09a0892620f9..b1a1e06a990213fc1b5f2cb446c140e3154d6b07 100644 (file)
@@ -317,8 +317,8 @@ def _gitbuilder(flavor, git_repo, extra_remotes={}, extra_packages=[], ignore=[]
                 sudo('git checkout %s' % gitbuilder_commit)
                 sudo('ln -s ../build.sh ./')
                 if branches_local_name != 'branches-local':
-                    sudo('mv ./branches-local ./branches-local-orig')
-                sudo('ln -s ../{branches_local_name} ./branches-local'.format(branches_local_name=branches_local_name))
+                    sudo('mv ../branches-local ../branches-local-orig')
+                sudo('ln -s ../branches-local {branches_local_name}'.format(branches_local_name=branches_local_name))
                 sudo('chown -R autobuild-ceph:autobuild-ceph out')
             sudo('mv gitbuilder.git.tmp gitbuilder.git')
         with cd('gitbuilder.git'):