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

import a fix from mls for getting product builds working.

Browse Source 
(Adapted to my changes from an hour ago)
This commit is contained in:
Adrian Schröter 2009-02-20 15:01:16 +00:00
parent 7ced81880e
commit 7a9970473f
2 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
osc/build.py
View File

@ -147,7 +147,7 @@ class Pac:
self.mp['pacsuffix'] = pacsuffix self.mp['pacsuffix'] = pacsuffix
self.mp['repopackage'] = node.get('repopackage') or '_repository' self.mp['repopackage'] = node.get('package') or '_repository'
self.mp['arch'] = node.get('arch') or self.mp['buildarch'] self.mp['arch'] = node.get('arch') or self.mp['buildarch']
self.mp['repoarch'] = node.get('repoarch') or self.mp['arch'] self.mp['repoarch'] = node.get('repoarch') or self.mp['arch']
@ -162,6 +162,10 @@ class Pac:
self.filename = '%(name)s-%(version)s-%(release)s.%(arch)s.%(pacsuffix)s' % self.mp self.filename = '%(name)s-%(version)s-%(release)s.%(arch)s.%(pacsuffix)s' % self.mp
self.mp['filename'] = self.filename self.mp['filename'] = self.filename
if self.mp['repopackage'] == '_repository':
self.mp['repofilename'] = self.mp['name']
else:
self.mp['repofilename'] = self.mp['filename']
# make the content of the dictionary accessible as class attributes # make the content of the dictionary accessible as class attributes
self.__dict__.update(self.mp) self.__dict__.update(self.mp)
@ -391,7 +395,7 @@ def main(opts, argv):
# OBS 1.5 and before has no downloadurl defined in buildinfo # OBS 1.5 and before has no downloadurl defined in buildinfo
if bi.downloadurl: if bi.downloadurl:
urllist.append( bi.downloadurl + '/%(project)s/%(repository)s/%(arch)s/%(filename)s' ) urllist.append( bi.downloadurl + '/%(project)s/%(repository)s/%(arch)s/%(filename)s' )
urllist.append( '%(scheme)s://%(apisrv)s/build/%(project)s/%(repository)s/%(buildarch)s/%(repopackage)s/%(name)s' ) urllist.append( '%(scheme)s://%(apisrv)s/build/%(project)s/%(repository)s/%(buildarch)s/%(repopackage)s/%(repofilename)s' )
fetcher = Fetcher(cachedir = config['packagecachedir'], fetcher = Fetcher(cachedir = config['packagecachedir'],
urllist = urllist, urllist = urllist,

6
osc/commandline.py
View File

@ -2206,8 +2206,8 @@ Please submit there instead, or use --nodevelproject to force direct submission.
"""${cmd_name}: Download binaries to a local directory """${cmd_name}: Download binaries to a local directory
This command downloads packages directly from the api server. This command downloads packages directly from the api server.
Thus, it does directly access the packages that are used for building Thus, it directly accesses the packages that are used for building
others, even when they aren't "published" yet. others even when they are not "published" yet.
${cmd_usage} ${cmd_usage}
${cmd_option_list} ${cmd_option_list}
@ -2224,7 +2224,7 @@ Please submit there instead, or use --nodevelproject to force direct submission.
if binaries == [ ]: if binaries == [ ]:
sys.exit('no binaries found. Either the package does not ' sys.exit('no binaries found. Either the package does not '
'exist, or no binaries have been built.') 'exist or no binaries have been built.')
for binary in binaries: for binary in binaries: