ownsrc fixes

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>

diff --git a/.gitignore b/.gitignore
index 3b08514f1ded58fda3227d027cf71ed75d8042ca..a4deb5d2d7fca0fb09e7d0a4377e08c4462eda98 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,4 @@ data.dump.dbg
 [tuv]
 tmp
 source
+srcpkgs

diff --git a/hippotatd b/hippotatd
index 24aca7c41232dac2aee0cc487e499ba4c493afe1..e9b62b7442bdde0a854b9d0cdad18f20d09b96e3 100755 (executable)
--- a/hippotatd
+++ b/hippotatd
@@ -264,8 +264,8 @@ def start_http():
   ssp.logger = partial(log_debug, DBG.OWNSOURCE)
   ssp.generate()
 
-  resource.putChild(b'source', twisted.web.static.File(ssp.output_paths[0]))
-  resource.putChild(b'srcpkgs', twisted.web.static.File(ssp.output_paths[0]))
+  resource.putChild(b'source',  twisted.web.static.File(ssp.output_paths[0]))
+  resource.putChild(b'srcpkgs', twisted.web.static.File(ssp.output_paths[1]))
 
   reactor.callLater(0.1, (lambda: log.info('hippotatd started', dflag=False)))
 

diff --git a/hippotatlib/ownsource.py b/hippotatlib/ownsource.py
index 8ecc7f2f68f0ef22a8717e8d85001294e540a5aa..1a294e61467f823b6d6c88e2cfd29fa219462f13 100644 (file)
--- a/hippotatlib/ownsource.py
+++ b/hippotatlib/ownsource.py
@@ -50,7 +50,7 @@ class SourceShipmentPreparer():
     s.cwd = os.getcwd()
     s.find_rune_base = "find -type f -perm -004 \! -path '*/tmp/*'"
     s.ignores = ['*~', '*.bak', '*.tmp', '#*#', '__pycache__',
-                  '[0-9][0-9][0-9][0-9]-src.cpio']
+                  '[0-9][0-9][0-9][0-9]-src.tar']
     s.rune_shell = ['/bin/bash', '-ec']
     s.show_pathnames = True
     s.download_packages = True
@@ -183,7 +183,7 @@ class SourceShipmentPreparer():
     find_rune = s.srcdir_find_rune(d)
     total_rune = s.rune_cpio % find_rune
 
-    name = s.new_output_name('src.cpio', infol)
+    name = s.new_output_name('src.tar', infol)
     s._dirmap[d] = name
     fh = s.open_output_fh(name, 'wb')