X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ian/git?a=blobdiff_plain;f=hippotatlib%2Fownsource.py;h=16ccdbd06510d41746f2d07cdd0bc065af9d1f35;hb=b3e598b5ea54399982e0183a3e59835b0f82f077;hp=ac467f0fa2fb048aefab52a60cd74ca7ea994221;hpb=ff0fc3fa841805cb45013d4fdb3c0ca142b7a330;p=hippotat.git diff --git a/hippotatlib/ownsource.py b/hippotatlib/ownsource.py index ac467f0..16ccdbd 100644 --- a/hippotatlib/ownsource.py +++ b/hippotatlib/ownsource.py @@ -40,7 +40,7 @@ except ImportError: pass class SourceShipmentPreparer(): def __init__(s, destdir): # caller may modify, and should read after calling generate() - s.output_names = ['srcbomb.tar.gz', 'fullsrcbomb.tar'] + s.output_names = ['srcbomb.tar.gz', 'srcpkgsbomb.tar'] s.output_paths = [None,None] # alternatively caller may read this # defaults, caller can modify after creation s.logger = lambda m: print('SourceShipmentPreparer',m) @@ -103,10 +103,10 @@ class SourceShipmentPreparer(): return [] r = [] for l in excl: - l.strip + l = l.strip() if l.startswith('#'): next if not len(l): next - r += l + r.append(l) return r def src_likeparent_git(s, src): @@ -364,6 +364,7 @@ class SourceShipmentPreparer(): s._destdir, outputs) def mk_packages_portmanteau(s): + if not s.download_packages: return s._mk_portmanteau(1, s.rune_portmanteau_uncompressed, s._packages_path, s._package_sources)