mirrors/github.com_openSUSE_osc
1
0
Fork 0
mirror of https://github.com/openSUSE/osc.git synced 2025-02-25 19:52:12 +01:00
Code

* add support for kiwi builds in output results

Browse Source 
* fix support for output directories, when they are not a symlink
This commit is contained in:
Adrian Schröter 2009-04-20 13:07:43 +00:00
parent b7ea9b64c0
commit 8b1882e7a9
1 changed files with 19 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
osc/build.py
View File

@ -199,6 +199,10 @@ def get_built_files(pacdir, pactype):
s_built = subprocess.Popen(['find', os.path.join(pacdir, 'SRPMS'),
'-name', '*.rpm'],
stdout=subprocess.PIPE).stdout.read().strip()
elif pactype == 'kiwi':
b_built = subprocess.Popen(['find', os.path.join(pacdir, 'KIWI'),
'-type', 'f'],
stdout=subprocess.PIPE).stdout.read().strip()
else:
b_built = subprocess.Popen(['find', os.path.join(pacdir, 'DEBS'),
'-name', '*.deb'],
@ -481,29 +485,28 @@ def main(opts, argv):
if hostarch != bi.buildarch:
cmd = (change_personality.get(bi.buildarch, '') + ' ' + cmd).strip()
print cmd
rc = subprocess.call(cmd, shell=True)
if rc:
print
print 'The buildroot was:', config['build-root']
sys.exit(rc)
pacdirlink = os.path.join(config['build-root'], '.build.packages')
if os.path.exists(pacdirlink):
pacdirlink = os.readlink(pacdirlink)
pacdir = os.path.join(config['build-root'], pacdirlink)
pacdir = os.path.join(config['build-root'], '.build.packages')
if os.path.islink(pacdir):
pacdir = os.readlink(pacdir)
pacdir = os.path.join(config['build-root'], pacdir)
if os.path.exists(pacdir):
(s_built, b_built) = get_built_files(pacdir, bi.pacsuffix)
if os.path.exists(pacdir):
(s_built, b_built) = get_built_files(pacdir, bi.pacsuffix)
print
if s_built: print s_built
print
print b_built
print
if s_built: print s_built
print
print b_built
if opts.keep_pkgs:
for i in b_built.splitlines() + s_built.splitlines():
import shutil
shutil.copy2(i, os.path.join(opts.keep_pkgs, os.path.basename(i)))
if opts.keep_pkgs:
for i in b_built.splitlines() + s_built.splitlines():
import shutil
shutil.copy2(i, os.path.join(opts.keep_pkgs, os.path.basename(i)))