ownsource: process .gitignore properly

[hippotat] / hippotatlib / ownsource.py

diff --git a/hippotatlib/ownsource.py b/hippotatlib/ownsource.py
index 8e309798456c7590a84326bc1f4e970f6ea048ca..135abebf0972048c39077c2f70360ba8acd2bf16 100644 (file)
--- a/hippotatlib/ownsource.py
+++ b/hippotatlib/ownsource.py
@@ -57,6 +57,8 @@ class SourceShipmentPreparer():
     s.rune_shell = ['/bin/bash', '-ec']
     s.show_pathnames = True
     s.download_packages = True
     s.rune_shell = ['/bin/bash', '-ec']
     s.show_pathnames = True
     s.download_packages = True

+    s.stream_stderr = sys.stderr
+    s.stream_debug = open('/dev/null','w')

     s.rune_cpio = r'''
             set -o pipefail
            (
     s.rune_cpio = r'''
             set -o pipefail
            (


@@ -101,10 +103,10 @@ class SourceShipmentPreparer():
       return []
     r = []
     for l in excl:
       return []
     r = []
     for l in excl:

-      l.strip
+      l = l.strip()

       if l.startswith('#'): next
       if not len(l): next
       if l.startswith('#'): next
       if not len(l): next

-      r += l
+      r.append(l)

     return r
 
   def src_likeparent_git(s, src):
     return r
 
   def src_likeparent_git(s, src):


@@ -274,8 +276,8 @@ class SourceShipmentPreparer():
         subprocess.run(cmdl,
                        cwd=s._packages_path,
                        stdin=subprocess.DEVNULL,
         subprocess.run(cmdl,
                        cwd=s._packages_path,
                        stdin=subprocess.DEVNULL,

-                       stdout=sys.stdout,
-                       stderr=sys.stderr,
+                       stdout=s.stream_debug,
+                       stderr=s.stream_stderr,

                        restore_signals=True,
                        check=True)
 
                        restore_signals=True,
                        check=True)