Merge pull request #255 from adrianschroeter/master

create reproducible obscpio archives
openSUSE · Sep 25, 2018 · c9489aa · c9489aa
2 parents 51a17c5 + 621dc38
commit c9489aa
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 5 deletions.
diff --git a/TarSCM/archive.py b/TarSCM/archive.py
@@ -60,8 +60,15 @@ def create_archive(self, scm_object, **kwargs):
 
         archivefilename = os.path.join(args.outdir, dstname + '.' + extension)
         archivefile     = open(archivefilename, "w")
+
+        # detect reproducible support
+        params = ['cpio', '--create', '--format=newc']
+        if os.system("cpio --create --format=newc" +
+                     "--reproducible </dev/null >/dev/null") == 0:
+            params.append('--reproducible')
+
         proc            = subprocess.Popen(
-            ['cpio', '--create', '--format=newc'],
+            params,
             shell  = False,
             stdin  = subprocess.PIPE,
             stdout = archivefile,

diff --git a/TarSCM/scm/hg.py b/TarSCM/scm/hg.py
@@ -26,14 +26,14 @@ def _get_scm_cmd(self):
                                         re.M | re.I)
 
                 if regexp_proxy.group(1) is not None:
-                        print ('using proxy host: ' + regexp_proxy.group(1))
+                        print('using proxy host: ' + regexp_proxy.group(1))
                         f.write('host=' + regexp_proxy.group(1))
                 if regexp_proxy.group(2) is not None:
-                        print ('using proxy port: ' + regexp_proxy.group(2))
+                        print('using proxy port: ' + regexp_proxy.group(2))
                         f.write('port=' + regexp_proxy.group(2))
                 if self.noproxy is not None:
-                        print ('using proxy exceptions: ' +
-                               self.noproxy)
+                        print('using proxy exceptions: ' +
+                              self.noproxy)
                         f.write('no=' + self.noproxy)
                 f.close()