centos/centpkg
1
0
Fork 0
mirror of https://git.centos.org/centos/centpkg.git synced 2025-02-23 08:12:55 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

rpmdefines changes depending on rpkg

Browse source 
Recent changes on rpkg side require modification in centpkg too.
rpmdefines in rpkg had to be changed because of a safer way
of executing the 'rpm' command in the 'subprocess' python library
(without shell=True argument).
A related change in rpkg: https://pagure.io/rpkg/pull-request/620
Other tools depending on rpkg (rhpkg, fedpkg, centpkg, rfpkg) are
affected.
Example for fedpkg: https://pagure.io/fedpkg/pull-request/486

Signed-off-by: Ondrej Nosek <onosek@redhat.com>
This commit is contained in:
Ondrej Nosek 2022-08-24 01:15:05 +02:00
parent f5ba2652d9
commit 9fb9aa563c
1 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
src/centpkg/__init__.py
View file

@ -189,14 +189,14 @@ class Commands(Commands):
self._distval = self._distvar.replace('.', '_')
self._disttag = 'el%s' % self._distval
self._rpmdefines = ["--define '_sourcedir %s'" % self.layout.sourcedir,
"--define '_specdir %s'" % self.layout.specdir,
"--define '_builddir %s'" % self.layout.builddir,
"--define '_srcrpmdir %s'" % self.layout.srcrpmdir,
"--define '_rpmdir %s'" % self.layout.rpmdir,
"--define 'dist .%s'" % self._disttag,
self._rpmdefines = ['--define', '_sourcedir %s' % self.layout.sourcedir,
'--define', '_specdir %s' % self.layout.specdir,
'--define', '_builddir %s' % self.layout.builddir,
'--define', '_srcrpmdir %s' % self.layout.srcrpmdir,
'--define', '_rpmdir %s' % self.layout.rpmdir,
'--define', 'dist .%s' % self._disttag,
# int and float this to remove the decimal
"--define '%s 1'" % self._disttag]
'--define', '%s 1' % self._disttag]
self.log.debug("RPMDefines: %s" % self._rpmdefines)
def construct_build_url(self, *args, **kwargs):