From b072d944cb64811530356f7bc7a20ae03a425602 Mon Sep 17 00:00:00 2001
From: Chenxiong Qi <cqi@redhat.com>
Date: Dec 19 2016 05:28:07 +0000
Subject: Refactor Commands._srpmdetails


This patch uses rpm Python binding to get name and list of files from a
SRPM. To keep consistence with original code, if there is something
wrong during getting rpm information, a rpkgError must be raised.

Signed-off-by: Chenxiong Qi <cqi@redhat.com>

---

diff --git a/pyrpkg/__init__.py b/pyrpkg/__init__.py
index 36a2a9b..91e376e 100644
--- a/pyrpkg/__init__.py
+++ b/pyrpkg/__init__.py
@@ -1060,41 +1060,17 @@ class Commands(object):
     def _srpmdetails(self, srpm):
         """Return a tuple of package name, package files, and upload files."""
 
-        # get the name
-        cmd = ['rpm', '-qp', '--nosignature', '--qf', '%{NAME}', srpm]
-        # Run the command
-        self.log.debug('Running: %s', ' '.join(cmd))
         try:
-            proc = subprocess.Popen(cmd, stdout=subprocess.PIPE,
-                                    stderr=subprocess.PIPE)
-            output, error = proc.communicate()
-        except OSError as e:
-            raise rpkgError(e)
-        name = output
-        if error:
-            raise rpkgError('Error querying srpm: %s' % error)
+            hdr = koji.get_rpm_header(srpm)
+            name = hdr[rpm.RPMTAG_NAME]
+            contents = hdr[rpm.RPMTAG_FILENAMES]
+        except Exception as e:
+            raise rpkgError('Error querying srpm: {0}'.format(str(e)))
 
         # now get the files and upload files
         files = []
         uploadfiles = []
-        cmd = ['rpm', '-qpl', srpm]
-        self.log.debug('Running: %s', ' '.join(cmd))
-        env = dict(os.environ)
-        env["LANG"] = "C"
-        try:
-            proc = subprocess.Popen(cmd, stdout=subprocess.PIPE,
-                                    stderr=subprocess.PIPE,
-                                    env=env)
-            output, error = proc.communicate()
-        except OSError as e:
-            raise rpkgError(e)
-        # work around signed SRPMs, for these rpm -qpl might print a warning
-        # like:
-        # warning: foo-0.0.src.rpm Header V3 RSA/SHA256 Signature, key ID
-        # fd431d51: NOKEY
-        if error and not error.startswith("warning:") and "NOKEY" not in error:
-            raise rpkgError('Error querying srpm: %s' % error)
-        contents = output.strip().split('\n')
+
         # Cycle through the stuff and sort correctly by its extension
         for file in contents:
             if file.rsplit('.')[-1] in self.UPLOADEXTS:
@@ -1102,7 +1078,7 @@ class Commands(object):
             else:
                 files.append(file)
 
-        return((name, files, uploadfiles))
+        return (name, files, uploadfiles)
 
     def _get_namespace_giturl(self, module):
         """Get the namespaced git url, if DistGit namespaces enabled