yudaike/openSUSE-release-tools
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

reverse logic

Browse Source
This commit is contained in:
Ludwig Nussel 2017-04-21 11:13:31 +02:00
parent 2687e7c682
commit af88bd1546
1 changed files with 26 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
biarchtool.py
View File

@ -135,11 +135,11 @@ class BiArchTool(ToolBase.ToolBase):
is_enabled = None is_enabled = None
is_disabled = None is_disabled = None
has_baselibs = None has_baselibs = None
must_enable = None must_disable = None
changed = None changed = None
if force: if force:
must_enable = True must_disable = False
for n in pkgmeta.findall("./build/enable[@arch='{}']".format(self.arch)): for n in pkgmeta.findall("./build/enable[@arch='{}']".format(self.arch)):
is_enabled = True is_enabled = True
@ -149,7 +149,7 @@ class BiArchTool(ToolBase.ToolBase):
break break
if pkg in self.biarch_packages: if pkg in self.biarch_packages:
logger.debug('%s is known biarch package', pkg) logger.debug('%s is known biarch package', pkg)
must_enable = True must_disable = False
else: else:
files = ET.fromstring(self.cached_GET(makeurl(self.apiurl, ['source', self.project, pkg]))) files = ET.fromstring(self.cached_GET(makeurl(self.apiurl, ['source', self.project, pkg])))
for n in files.findall("./entry[@name='baselibs.conf']"): for n in files.findall("./entry[@name='baselibs.conf']"):
@ -157,21 +157,35 @@ class BiArchTool(ToolBase.ToolBase):
logger.debug('%s has baselibs', pkg) logger.debug('%s has baselibs', pkg)
break break
if has_baselibs: if has_baselibs:
must_enable = True must_disable = False
else:
must_disable = True
if must_enable: if must_disable == False:
if is_disabled: if is_disabled:
logger.warn('%s should be enabled but is disabled', pkg) logger.info('enabling %s for %s', pkg, self.arch)
if not is_enabled: for build in pkgmeta.findall("./build"):
logger.info('enabling %s for biarch', pkg) for n in build.findall("./disable[@arch='{}']".format(self.arch)):
build.remove(n)
changed = True
if changed == False:
logger.error('build tag not found in %s/%s!?', pkg, self.arch)
elif must_disable == True:
logger.info('disabling %s for %s', pkg, self.arch)
bn = pkgmeta.find('build') bn = pkgmeta.find('build')
if bn is None: if bn is None:
bn = ET.SubElement(pkgmeta, 'build') bn = ET.SubElement(pkgmeta, 'build')
ET.SubElement(bn, 'enable', { 'arch' : self.arch }) ET.SubElement(bn, 'disable', { 'arch' : self.arch })
changed = True changed = True
else:
if is_enabled: if is_enabled:
logger.warn("%s enabled or biarch without need", pkg) logger.info('removing explicit enable %s for %s', pkg, self.arch)
for build in pkgmeta.findall("./build"):
for n in build.findall("./enable[@arch='{}']".format(self.arch)):
build.remove(n)
changed = True
if changed == False:
logger.error('build tag not found in %s/%s!?', pkg, self.arch)
if changed: if changed:
try: try: