Commits

Mikhail Korobov committed 49efd64

stray SRC_BASEs are removed

  • Participants
  • Parent commits 24ec266

Comments (0)

Files changed (1)

File fab_deploy/deploy.py

             print 'Valid arguments are: %s' % allowed_args
             return
 
-    repo = 'ssh://%s@%s/%s/%s/' % (env.conf['USER'], env.conf['HOST'], env.conf['SRC_BASE'], env.conf['INSTANCE_NAME'])
+    repo = 'ssh://%s@%s/src/%s/' % (env.conf['USER'], env.conf['HOST'], env.conf['INSTANCE_NAME'])
     local('hg push %s' % repo)
     delete_pyc()
-    with cd(env.conf['SRC_BASE']):
-        with cd(env.conf['INSTANCE_NAME']):
-            output = run('hg up')
-            updated = '0 files updated, 0 files merged, 0 files removed, 0 files unresolved' not in output
+    with cd('src/'+env.conf['INSTANCE_NAME']):
+        output = run('hg up')
+        updated = '0 files updated, 0 files merged, 0 files removed, 0 files unresolved' not in output
     if updated or 'force' in args:
         if 'pip_update' in args:
             pip_update(restart=False)
 def up(branch=None):
     delete_pyc()
     branch = branch or env.conf['HG_BRANCH']
-    with cd(env.conf['SRC_BASE']):
-        with cd(env.conf['INSTANCE_NAME']):
-            run('hg up -C %s' % branch)
+    with cd('src/'+ env.conf['INSTANCE_NAME']):
+        run('hg up -C %s' % branch)
     compress()
     touch()
 
 
 def make_clone():
-    with cd(env.conf['SRC_BASE']):
+    with cd('src'):
         with settings(warn_only=True):
             run('mkdir %s' % env.conf['INSTANCE_NAME'])
             with cd(env.conf['INSTANCE_NAME']):
                 run('hg init')
-    local('hg push ssh://%s@%s/%s/%s/' % (env.conf['USER'], env.conf['HOST'], env.conf['SRC_BASE'], env.conf['INSTANCE_NAME']))
-    with cd(env.conf['SRC_BASE']):
+    local('hg push ssh://%s@%s/src/%s/' % (env.conf['USER'], env.conf['HOST'], env.conf['INSTANCE_NAME']))
+    with cd('src'):
         with cd(env.conf['INSTANCE_NAME']):
             run('hg up -C %s' % env.conf['HG_BRANCH'])
     update_config(only_upload=True)