From 7a9970473fe72f1a308319bebbf326074cb71310 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adrian=20Schr=C3=B6ter?= Date: Fri, 20 Feb 2009 15:01:16 +0000 Subject: [PATCH] import a fix from mls for getting product builds working. (Adapted to my changes from an hour ago) --- osc/build.py | 8 ++++++-- osc/commandline.py | 6 +++--- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/osc/build.py b/osc/build.py index 9a55212f..7e31c5f2 100644 --- a/osc/build.py +++ b/osc/build.py @@ -147,7 +147,7 @@ class Pac: 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['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.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 self.__dict__.update(self.mp) @@ -391,7 +395,7 @@ def main(opts, argv): # OBS 1.5 and before has no downloadurl defined in buildinfo if bi.downloadurl: 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'], urllist = urllist, diff --git a/osc/commandline.py b/osc/commandline.py index e26acc7d..d9b67be3 100755 --- a/osc/commandline.py +++ b/osc/commandline.py @@ -2206,8 +2206,8 @@ Please submit there instead, or use --nodevelproject to force direct submission. """${cmd_name}: Download binaries to a local directory This command downloads packages directly from the api server. - Thus, it does directly access the packages that are used for building - others, even when they aren't "published" yet. + Thus, it directly accesses the packages that are used for building + others even when they are not "published" yet. ${cmd_usage} ${cmd_option_list} @@ -2224,7 +2224,7 @@ Please submit there instead, or use --nodevelproject to force direct submission. if binaries == [ ]: 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: