The following commit has been merged in the devel branch:
commit 2242a55bfbf74bc81bbcdf9c9d1b252bb764888c
Author: Andreas Tille <[email protected]>
Date: Mon Nov 26 21:35:59 2012 +0100
Try to fix the missings from cherry-pick
diff --git a/webtools/blendstasktools.py b/webtools/blendstasktools.py
index c31e5ef..eafea02 100644
--- a/webtools/blendstasktools.py
+++ b/webtools/blendstasktools.py
@@ -567,9 +567,9 @@ def FetchTasksFiles(data):
# tasks directory to obtain dependencies and debian/control to obtain meta
# information like the metapackage prefix
- for dir in ('tasks', 'debian'):
- # Checkout/Update tasks from SVN
- if data['vcsdir'].startswith('svn:'):
+ # Checkout/Update tasks from SVN
+ if data['vcsdir'].startswith('svn:'):
+ for dir in ('tasks', 'debian'):
tasksdir = data['datadir'] + '/' + dir
if not os.access(tasksdir, os.W_OK):
try:
@@ -592,24 +592,24 @@ def FetchTasksFiles(data):
else:
logger.error("There are no old files in %s -> giving
up" % tasksdir)
exit(-1)
- elif data['vcsdir'].startswith('git:') or
data['vcsdir'].startswith('http:'):
- githtml = data['vcsdir']
- if githtml.startswith('git:'):
- githtml=githtml.replace('git://','http://')
+ elif data['vcsdir'].startswith('git:') or
data['vcsdir'].startswith('http:'):
+ githtml = data['vcsdir']
+ if githtml.startswith('git:'):
+ githtml=githtml.replace('git://','http://')
+ if os.path.isdir(data['datadir']+'/.git'):
+ gitcommand = "cd %s; git pull" % data['datadir']
+ else:
+ gitcommand = "cd %s; git clone %s" % (re.sub('/[^/]+$', '',
data['datadir']), githtml)
+ if os.system(gitcommand):
+ logger.error("Git command %s failed" % (gitcommand))
if os.path.isdir(data['datadir']+'/.git'):
- gitcommand = "cd %s; git pull" % data['datadir']
- else:
- gitcommand = "cd %s; git clone %s" % (re.sub('/[^/]+$', '',
data['datadir']), githtml)
- if os.system(gitcommand):
- logger.error("Git command %s failed" % (gitcommand))
- if os.path.isdir(data['datadir']+'/.git'):
- logger.error("Trying old files in %s ..." % data['datadir'])
- else:
- if os.listdir(data['datadir']+'/'+dir):
- logger.warning("No .git directory found in %s but
trying those random files there as tasks files." % data['datadir']+'/'+dir)
- else:
- logger.error("There are no old files in %s -> giving
up" % data['datadir'])
- exit(-1)
+ logger.error("Trying old files in %s ..." % data['datadir'])
+ else:
+ if os.listdir(data['datadir']+'/'+dir):
+ logger.warning("No .git directory found in %s but trying
those random files there as tasks files." % data['datadir']+'/'+dir)
+ else:
+ logger.error("There are no old files in %s -> giving up" %
data['datadir'])
+ exit(-1)
else:
logger.error("Don't know how to checkout tasks files from %s ->
giving up" % data['vcsdir'])
exit(-1)
--
Static and dynamic websites for Debian Pure Blends
_______________________________________________
Blends-commit mailing list
[email protected]
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/blends-commit
