mirrors/github.com_openSUSE_osc
1
0
Fork 0
mirror of https://github.com/openSUSE/osc.git synced 2025-09-06 13:18:42 +02:00
Code Activity

- fixed #590611 ("'osc build' uses incorrect filename for debian debs")

Browse Source
This commit is contained in:
Marcus Huewe
2010-03-24 13:20:09 +01:00
parent 56e728fc44
commit af273d0bdb
5 changed files with 25 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
osc/build.py
View File

@@ -12,6 +12,7 @@ from tempfile import NamedTemporaryFile
from shutil import rmtree
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, is_package_dir
from osc.util import rpmquery, debquery
import osc.conf
import oscerr
import subprocess
@@ -165,10 +166,10 @@ class Pac:
self.mp['apiurl'] = apiurl
if self.mp['release']:
self.filename = '%(name)s-%(version)s-%(release)s.%(arch)s.%(pacsuffix)s' % self.mp
if pacsuffix == 'deb':
self.filename = debquery.DebQuery.filename(self.mp['name'], self.mp['version'], self.mp['release'], self.mp['arch'])
else:
self.filename = '%(name)s-%(version)s.%(arch)s.%(pacsuffix)s' % self.mp
self.filename = rpmquery.RpmQuery.filename(self.mp['name'], self.mp['version'], self.mp['release'], self.mp['arch'])
self.mp['filename'] = self.filename
if self.mp['repopackage'] == '_repository':