fix some bugs

This commit is contained in:
Stephan Kulow 2014-01-23 07:16:47 +01:00
parent efd63d01ce
commit 00e101f2ff
3 changed files with 8 additions and 6 deletions

View File

@ -131,7 +131,7 @@ sub check_depinfo_ring($$) {
}
check_depinfo_ring('openSUSE:Factory:Build', 'openSUSE:Factory:Core');
#check_depinfo_ring('openSUSE:Factory:Core', 'openSUSE:Factory:MainDesktops');
check_depinfo_ring('openSUSE:Factory:Core', 'openSUSE:Factory:MainDesktops');
#check_depinfo_ring('openSUSE:Factory:MainDesktops', 'openSUSE:Factory:DVD');
my $fact = fetch_prj('openSUSE:Factory');

View File

@ -113,9 +113,9 @@ def _checkercore_freeze_prjlink(self, prj, opts):
links = root.findall('link')
links.reverse()
for link in links:
prj = link.get('project')
fl = ET.SubElement(flink, 'frozenlink', { 'project': prj } )
sources = self._checkercore_receive_sources(prj, sources, fl, opts)
lprj = link.get('project')
fl = ET.SubElement(flink, 'frozenlink', { 'project': lprj } )
sources = self._checkercore_receive_sources(lprj, sources, fl, opts)
url = makeurl(opts.apiurl, ['source', prj, '_project', '_frozenlinks'], { 'meta': '1' } )
f = http_PUT(url, data=ET.tostring(flink))

View File

@ -48,9 +48,11 @@ def do_rqlink(self, subcmd, opts, *args):
url = makeurl(opts.apiurl, ['source', prj, pkg], { 'rev': rev, 'expand': 1 })
f = http_GET(url)
rev = ET.parse(f).getroot().attrib['srcmd5']
root = ET.parse(f).getroot()
rev = root.attrib['srcmd5']
vrev = root.attrib['vrev']
print "osc linkpac -r %s %s/%s %s/%s" % (rev, prj, pkg, args[1], tpkg)
link_pac(prj, pkg, args[1], tpkg, force=True, rev=rev)
link_pac(prj, pkg, args[1], tpkg, force=True, rev=rev, vrev=vrev)
url = makeurl(opts.apiurl, ['source', args[1], '_meta'])
f = http_GET(url)