chiark / gitweb /
ownsource fixes
authorIan Jackson <ijackson@chiark.greenend.org.uk>
Tue, 4 Apr 2017 15:43:01 +0000 (16:43 +0100)
committerIan Jackson <ijackson@chiark.greenend.org.uk>
Tue, 4 Apr 2017 15:43:01 +0000 (16:43 +0100)
hippotatlib/ownsource.py

index ea78664..218661a 100644 (file)
@@ -203,7 +203,7 @@ class SourceShipmentPreparer():
       s.manifest_append_absentfile(dscfname, [debfname])
       for fname in pi['files']:
         infol = files[fname]
-        if s.show_pathnames: infol = infol + [fname]
+        if s.show_pathnames: infol = infol + ['loaded='+fname]
         s.manifest_append_absentfile(' \t' + debfname, infol)
 
   def thing_ought_packaged(s, fname):
@@ -230,12 +230,13 @@ class SourceShipmentPreparer():
     s.src_file(program, infol)
 
   def src_syspath(s, fname, infol):
+    if s.thing_ought_packaged(fname): return
     s.src_indir(fname, infol)
 
   def src_module(s, m, infol):
     try: fname = m.__file__
     except AttributeError: return
-    infol.append(m.__name__)
+    infol.append('module='+m.__name__)
 
     if s.thing_ought_packaged(fname):
       s.src_file_packaged(fname, infol)