mirrors/github.com_openSUSE_osc
1
0
Fork 0
mirror of https://github.com/openSUSE/osc.git synced 2025-02-04 18:46:17 +01:00
Code

double check the correctness of the build info for local build,

Browse Source 
otherwise packages are stored incorrectly in the package cache
and that might cause problems later. Also refuse to build an
architecture locally that is not supported by the host architecture
This commit is contained in:
Dirk Mueller 2008-06-20 13:37:49 +00:00
parent 3fb7530028
commit 1be2163733
1 changed files with 22 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
osc/build.py
View File

@ -14,6 +14,7 @@ from tempfile import NamedTemporaryFile
from osc.fetch import * from osc.fetch import *
from osc.core import get_buildinfo, store_read_apiurl, store_read_project, store_read_package, meta_exists, quote_plus, get_buildconfig from osc.core import get_buildinfo, store_read_apiurl, store_read_project, store_read_package, meta_exists, quote_plus, get_buildconfig
import osc.conf import osc.conf
import oscerr
try: try:
from xml.etree import cElementTree as ET from xml.etree import cElementTree as ET
except ImportError: except ImportError:
@ -24,13 +25,15 @@ from conf import config
change_personality = { change_personality = {
'i686': 'linux32', 'i686': 'linux32',
'i586': 'linux32', 'i586': 'linux32',
'i386': 'linux32',
'ppc': 'powerpc32', 'ppc': 'powerpc32',
's390': 's390', 's390': 's390',
} }
can_also_build = { can_also_build = {
'x86_64': ['i686', 'i586'], 'x86_64': ['i686', 'i586', 'i386'],
'i686': ['i586'], 'i686': ['i586'],
'i386': ['i586'],
'ppc64': ['ppc'], 'ppc64': ['ppc'],
's390x': ['s390'], 's390x': ['s390'],
} }
@ -82,12 +85,23 @@ class Buildinfo:
self.deps = [] self.deps = []
for node in root.findall('bdep'): for node in root.findall('bdep'):
p = Pac(node.get('name'), p_name = node.get('name')
node.get('version'), p_arch = node.get('arch')
node.get('release'), if not p_arch:
p_arch = self.buildarch
p_version = node.get('version')
p_release = node.get('release')
if not (p_name and p_arch and p_version and p_release):
raise oscerr.APIError(
"buildinfo for package %s/%s/%s/%s is incomplete" % (p_name, p_arch, p_version, p_release))
p = Pac(p_name,
p_version,
p_release,
node.get('project'), node.get('project'),
node.get('repository'), node.get('repository'),
node.get('arch'), p_arch,
node.get('preinstall'), node.get('preinstall'),
node.get('runscripts'), node.get('runscripts'),
self.buildarch, # buildarch is used only for the URL to access the full tree... self.buildarch, # buildarch is used only for the URL to access the full tree...
@ -392,7 +406,9 @@ def main(opts, argv):
# change personality, if needed # change personality, if needed
if bi.buildarch in can_also_build.get(hostarch, []): if bi.buildarch in can_also_build.get(hostarch, []):
cmd = change_personality[bi.buildarch] + ' ' + cmd cmd = change_personality[bi.buildarch] + ' ' + cmd
else:
print >>sys.stderr, 'Error: hostarch \'%s\' cannot build \'%s\'.' % (hostarch, bi.buildarch)
return 1
print cmd print cmd
rc = os.system(cmd) rc = os.system(cmd)