The following commit has been merged in the master branch:
commit e8ebefee8911cc9b06112bee49c50cc848affedc
Author: Andreas Tille <[email protected]>
Date: Mon Nov 26 16:23:27 2012 +0100
Do not fix host to checkout tasks files to svn://svn.debian.org to enable
other hosts (rather other repositories)
diff --git a/webtools/blendstasktools.py b/webtools/blendstasktools.py
index 92ac1a8..98436bb 100644
--- a/webtools/blendstasktools.py
+++ b/webtools/blendstasktools.py
@@ -53,8 +53,6 @@ logger.setLevel(logging.INFO)
# Seems to have problems on 17.04.2009
# BASEURL = 'http://ftp.debian.org/debian'
BASEURL = 'http://ftp.de.debian.org/debian'
-# SVNHOST = 'svn+ssh://svn.debian.org'
-SVNHOST = 'svn://svn.debian.org'
KEYSTOIGNORE = ( 'Architecture', 'Comment', 'Leaf', 'NeedConfig', 'Note',
'Section',
'Needconfig', 'DontAvoid',
'Enhances', 'Test-always-lang', 'Metapackage')
@@ -568,22 +566,29 @@ def FetchTasksFiles(data):
except:
logger.error("Unable to create data directory", tasksdir)
# Checkout/Update tasks from SVN
- svncommand = "svn %%s %s/%s/%s %s >> /dev/null" % (SVNHOST,
data['vcsdir'], dir, tasksdir)
- if os.path.isdir(tasksdir+'/.svn'):
- svncommand = svncommand % ' --accept theirs-conflict up'
- else:
- os.system("mkdir -p %s" % (tasksdir))
- svncommand = svncommand % 'co'
- if os.system(svncommand):
- logger.error("SVN command %s failed" % (svncommand))
+ if data['vcsdir'].startswith('svn:'):
+ svncommand = "svn %%s %s/%s %s >> /dev/null" % (data['vcsdir'],
dir, tasksdir)
if os.path.isdir(tasksdir+'/.svn'):
- logger.error("Trying old files in %s ..." % tasksdir)
- else:
- if os.listdir(tasksdir):
- logger.warning("No .svn directory found in %s but trying
those random files there as tasks files." % tasksdir)
- else:
- logger.error("There are no old files in %s -> giving up" %
tasksdir)
- exit(-1)
+ svncommand = svncommand % ' --accept theirs-conflict up'
+ else:
+ os.system("mkdir -p %s" % (tasksdir))
+ svncommand = svncommand % 'co'
+ if os.system(svncommand):
+ logger.error("SVN command %s failed" % (svncommand))
+ if os.path.isdir(tasksdir+'/.svn'):
+ logger.error("Trying old files in %s ..." % tasksdir)
+ else:
+ if os.listdir(tasksdir):
+ logger.warning("No .svn directory found in %s but
trying those random files there as tasks files." % tasksdir)
+ else:
+ logger.error("There are no old files in %s -> giving
up" % tasksdir)
+ exit(-1)
+ elif data['vcsdir'].startswith('git:'):
+ print "Checkout Git repository from", data['vcsdir']
+ exit(-1)
+ else:
+ logger.error("Don't know how to checkout tasks files from %s ->
giving up" % data['vcsdir'])
+ exit(-1)
return data['datadir'] + '/tasks'
def RowDictionaries(cursor):
--
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
