mirrors/github.com_openSUSE_osc
1
0
Fork 0
mirror of https://github.com/openSUSE/osc.git synced 2024-12-27 10:16:14 +01:00
Code

Merge branch 'master' of https://github.com/adrianschroeter/osc

Browse Source
This commit is contained in:
Marcus Huewe 2016-04-08 09:33:58 +02:00
commit 51fe8e1401
2 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
NEWS
View File

@ -1,4 +1,5 @@
0.154
- switch to new obs_scm service when adding git URL's
- set OSC_VERSION environment for source services
0.153

13
osc/core.py
View File

@ -343,21 +343,27 @@ class Serviceinfo:
def addSetVersion(self, serviceinfo_node):
r = serviceinfo_node
s = ET.Element( "service", name="set_version" )
s = ET.Element( "service", name="set_version", mode="buildtime" )
r.append( s )
return r
def addGitUrl(self, serviceinfo_node, url_string):
r = serviceinfo_node
s = ET.Element( "service", name="tar_scm" )
s = ET.Element( "service", name="obs_scm" )
ET.SubElement(s, "param", name="url").text = url_string
ET.SubElement(s, "param", name="scm").text = "git"
r.append( s )
return r
def addTarUp(self, serviceinfo_node):
r = serviceinfo_node
s = ET.Element( "service", name="tar", mode="buildtime" )
r.append( s )
return r
def addRecompressTar(self, serviceinfo_node):
r = serviceinfo_node
s = ET.Element( "service", name="recompress" )
s = ET.Element( "service", name="recompress", mode="buildtime" )
ET.SubElement(s, "param", name="file").text = "*.tar"
ET.SubElement(s, "param", name="compression").text = "xz"
r.append( s )
@ -6644,6 +6650,7 @@ def addGitSource(url):
stripETxml( services )
si = Serviceinfo()
s = si.addGitUrl(services, url)
s = si.addTarUp(services)
s = si.addRecompressTar(services)
s = si.addSetVersion(services)
si.read(s)