ownsource fixes

diff --git a/hippotatlib/ownsource.py b/hippotatlib/ownsource.py
index ea78664ec560b35557a9b2b78a01484b4d1d57da..218661a5ec006e34aca6358bb2df2988b59df2f7 100644 (file)
--- a/hippotatlib/ownsource.py
+++ b/hippotatlib/ownsource.py
@@ -203,7 +203,7 @@ class SourceShipmentPreparer():
       s.manifest_append_absentfile(dscfname, [debfname])
       for fname in pi['files']:
         infol = files[fname]
       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):
         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):
     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
     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)
 
     if s.thing_ought_packaged(fname):
       s.src_file_packaged(fname, infol)