From 79656a45e1be85e896e84bc794d8dce1060d47b5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adrian=20Schr=C3=B6ter?= Date: Wed, 26 Jan 2011 17:29:43 +0100 Subject: [PATCH] fix "osc add some_git_url", using now official source service instead of unknown git_pull --- osc/commandline.py | 2 +- osc/core.py | 12 +++++++++++- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/osc/commandline.py b/osc/commandline.py index 4658c7f4..7bcbc914 100644 --- a/osc/commandline.py +++ b/osc/commandline.py @@ -3044,7 +3044,7 @@ Please submit there instead, or use --nodevelproject to force direct submission. # Do some magic here, when adding a url. We want that the server to download the tar ball and to verify it for arg in parseargs(args): - if arg.startswith('http://') or arg.startswith('https://') or arg.startswith('ftp://'): + if arg.startswith('http://') or arg.startswith('https://') or arg.startswith('ftp://') or arg.startswith('git://'): if arg.endswith('.git'): addGitSource(arg) else: diff --git a/osc/core.py b/osc/core.py index 33e0d779..fe47436b 100644 --- a/osc/core.py +++ b/osc/core.py @@ -316,8 +316,17 @@ class Serviceinfo: def addGitUrl(self, serviceinfo_node, url_string): r = serviceinfo_node - s = ET.Element( "service", name="git_pull" ) + s = ET.Element( "service", name="tar_scm" ) ET.SubElement(s, "param", name="url").text = url_string + ET.SubElement(s, "param", name="scm").text = "git" + r.append( s ) + return r + + def addRecompressTar(self, serviceinfo_node): + r = serviceinfo_node + s = ET.Element( "service", name="recompress" ) + ET.SubElement(s, "param", name="file").text = "*.tar" + ET.SubElement(s, "param", name="compression").text = "bz2" r.append( s ) return r @@ -5618,6 +5627,7 @@ def addGitSource(url): stripETxml( services ) si = Serviceinfo() s = si.addGitUrl(services, url) + s = si.addRecompressTar(services) si.read(s) # for pretty output