rpmdefines changes depending on rpkg

Recent changes on rpkg side require modification in rfpkg 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 <[email protected]>
rpmfusion-infra · Aug 23, 2022 · f0d6fd6 · f0d6fd6
1 parent 5f9850f
commit f0d6fd6
Showing 1 changed file with 12 additions and 12 deletions.
diff --git a/rfpkg/__init__.py b/rfpkg/__init__.py
@@ -158,22 +158,22 @@ def load_rpmdefines(self):
             raise pyrpkg.rpkgError('Could not find the release/dist from branch name '
                                    '%s\nPlease specify with --release' %
                                    self.branch_merge)
-        self._rpmdefines = ["--define '_sourcedir %s'" % self.path,
-                            "--define '_specdir %s'" % self.path,
-                            "--define '_builddir %s'" % self.path,
-                            "--define '_srcrpmdir %s'" % self.path,
-                            "--define '_rpmdir %s'" % self.path,
-                            "--define 'dist .%s'" % self._disttag,
-                            "--define '%s %s'" % (self._distvar,
-                                                  self._distval),
-                            "--eval '%%undefine %s'" % self._distunset,
-                            "--define '%s 1'" % self._disttag]
+        self._rpmdefines = ['--define', '_sourcedir %s' % self.path,
+                            '--define', '_specdir %s' % self.path,
+                            '--define', '_builddir %s' % self.path,
+                            '--define', '_srcrpmdir %s' % self.path,
+                            '--define', '_rpmdir %s' % self.path,
+                            '--define', 'dist .%s' % self._disttag,
+                            '--define', '%s %s' % (self._distvar,
+                                                   self._distval),
+                            '--eval', '%%undefine %s' % self._distunset,
+                            '--define', '%s 1' % self._disttag]
         if self._runtime_disttag:
             if self._disttag != self._runtime_disttag:
                 # This means that the runtime is known, and is different from
                 # the target, so we need to unset the _runtime_disttag
-                self._rpmdefines.append("--eval '%%undefine %s'" %
-                                        self._runtime_disttag)
+                self._rpmdefines.extend(['--eval', '%%undefine %s' %
+                                        self._runtime_disttag])
 
     def load_target(self):
         """This creates the target attribute based on branch merge"""