X-Git-Url: https://git.distorted.org.uk/~mdw/hippotat/blobdiff_plain/b635cd93477f2c2923f5eb25cce1237423e0c3c2..a53aba4d6a664204ac335b44a830210e79f2af07:/hippotatlib/ownsource.py diff --git a/hippotatlib/ownsource.py b/hippotatlib/ownsource.py index b434f32..89bc43f 100644 --- a/hippotatlib/ownsource.py +++ b/hippotatlib/ownsource.py @@ -12,8 +12,10 @@ class SourceShipmentPreparer(): s.output_name = 'srcbomb.tar.gz' # defaults, caller can modify after creation s.src_filter = s.src_filter_glob - s.src_filter_globs = ['/usr/local/*', '!/usr*', '!/etc/*'] + s.src_package_globs = [!'/usr/local/*', '/usr*'] + s.src_filter_globs = ['!/etc/*'] s.src_likeparent = s.src_likeparent_git + s.report_from_packages = s.report_from_packages_debian s.cwd = os.getcwd() s.find_rune_base = "find -type f -perm -004 \! -path '*/tmp/*'" s.excludes = ['*~', '*.bak', '*.tmp', '#*#', @@ -33,22 +35,27 @@ class SourceShipmentPreparer(): s.rune_portmanteau = r''' outfile=$1; shift rm -f "$outfile" - GZIP=-9 tar zcf "$outfile" "$@"' + GZIP=-1 tar zcf "$outfile" "$@" ''' s.manifest_name='0000-MANIFEST.txt' # private s._destdir = destdir s._outcounter = 0 s._manifest = [] + s._dirmap = { } + s._package_files = { } # map filename => infol - def src_filter_glob(s, src): # default s.src_filter - for pat in s.src_filter_globs: + def thing_matches_globs(s, thing, globs): + for pat in globs: negate = pat.startswith('!') if negate: pat = pat[1:] - if fnmatch.fnmatch(src, pat): + if fnmatch.fnmatch(thing, pat): return not negate return negate + def src_filter_glob(s, src): # default s.src_filter + return s.thing_matches_globs(s, src, s.src_filter_globs) + def src_likeparent_git(s, src): try: os.stat(os.path.join(src, '.git/.')) @@ -91,7 +98,7 @@ class SourceShipmentPreparer(): def src_prenormaliser(s, d, infol): # callers may monkey-patch away return os.path.join(s.cwd, os.path.abspath(d)) - def src_find_rune(s, d): + def srcdir_find_rune(s, d): script = s.find_rune_base for excl in s.excludes + [s.output_name, s.manifest_name]: assert("'" not in excl) @@ -99,24 +106,33 @@ class SourceShipmentPreparer(): script += ' -print0' return script + def manifest_append(s, name, infol): + s._manifest.append({ 'file':name, 'info':' '.join(infol) }) + def new_output_name(s, nametail, infol): s._outcounter += 1 name = '%04d-%s' % (s._outcounter, nametail) - s._manifest.append((name, ' '.join(infol))) + s.manifest_append(name, infol) return name - def new_output_fh(s, nametail, infol): - name = s.new_output_name(nametail, infol) - return s.open_output_fh(name, 'wb') - def open_output_fh(s, name, mode): return open(os.path.join(s._destdir, name), mode) - def mk_from_dir(s, d, infol): + def src_dir(s, d, infol): + try: name = s._dirmap[d] + except KeyError: pass + else: + s.manifest_append(name, infol) + return + if s.show_pathnames: infol.append(d) - find_rune = s.src_find_rune(d) + find_rune = s.srcdir_find_rune(d) total_rune = s.rune_cpio % find_rune - fh = s.new_output_fh('src.cpio', infol) + + name = s.new_output_name('src.cpio', infol) + s._dirmap[d] = name + fh = s.open_output_fh(name, 'wb') + subprocess.run(s.rune_shell + [total_rune], cwd=d, stdin=subprocess.DEVNULL, @@ -125,26 +141,117 @@ class SourceShipmentPreparer(): check=True) fh.close() - def mk_from_src(s, d, infol): + def src_indir(s, d, infol): d = s.src_prenormaliser(d, infol) if not s.src_filter(d): return + d = s.src_parentfinder(d, infol) - s.mk_from_dir(d, infol) + s.dir(d, infol) + + def report_from_packages_debian(s, files): + dpkg_S_in = tempfile.TemporaryFile() + for (file, infols) in files.items(): + assert('\n' not in file) + dpkg_S_in.write(file) + dpkg_S_in.write('\0') + dpkg_S_in.seek(0) + cmdl = ['xargs','-0r','dpkg','-S','--'] + dpkg_S = subprocess.Popen(cmdl, + cwd='/', + stdin=dpkg_S_in, + stdout=subprocess.PIPE, + stderr=sys.stderr, + close_fds=False) + dpkg_show_in = tempfile.TemporaryFile() + pkginfos = { } + for l in dpkgs.stdout: + (pkgs, fname) = l.split(': ',1) + pkgs = pkgs.split(', ') + for p in pkgs: + pkginfos.setdefault(p,{'files':[]})['files'].append([fname, infol]) + print(p, file=dpkg_show_in) + assert(dpkg_S.wait() == 0) + dpkg_show_in.seek(0) + cmdl = ['xargs','-r','dpkg-query', + r'-f${Package}\t${Architecture}\t${Version}\t${Source}\t${Source-Version}\n' + '--show','--'] + dpkg_show = subprocess.Popen(cmdl, + cwd='/', + stdin=dpkg_show_in, + stdout=subprocess.PIPE, + stderr=sys.stderr, + close_fds=False) + for l in dpkg_show.stdout: + (p,a,v) = l.split('\t') + pkginfos[p]['arch'] = a + pkginfos[p]['version'] = v + pkginfos[p]['source'] = v + pkginfos[p]['sourceversion'] = v + assert(dpkg_show.wait() == 0) + pl = pkginfos.keys() + pl.sort() + for p in pl: + pi = pkginfos[p] + debfname = '%s_%s_%s.deb' % (p, pi['version'], pi['arch']) + dscfname = '%s_%s.dsc' % (pi['source'], pi['sourceversion']) + s._manifest.append({ 'file_print': dscfname, 'info': debfname }) + for (fname, infol) in pi['files']: + s._manifest.append({ 'file_print': fname, 'info': ' '.join(infol) }) + + def thing_ought_packaged(s, fname): + return s.thing_matches_globs(fname, s.src_package_globs) + + def src_file_packaged(s, fname); + s._package_files.setdefault(fname,[]).append(infol) + + def src_file(s, fname, infol): + def fngens(): + yield fname + yield s.path_prenormaliser(fname) + yield os.path.realpath(fname) + + for fn in fngens(): + if s.thing_ought_packaged(fngen): + s.src_file_packaged(fname, infol) + return + + s.src_indir(fname, infol) + + def src_argv0(s, program, infol): + s.src_file(s, program, infol) + + def src_syspath(s, fname, infol): + s.src_indir(fname, infol) + + def src_module(s, m, infol): + try: fname = m.__file__ + except AttributeError: return + infol.append(m.__name__) + + if s.thing_ought_packaged(fname): + s.src_file_packaged(fname, infol) + else: + s.src_indir(s, fname) - def mk_from_srcs(s, dirs=sys.path): - s.mk_from_src(sys.argv[0], ['argv[0]']) + def srcs_allitems(s, dirs=sys.path): + s.src_argv0(sys.argv[0], ['argv[0]']) for d in sys.path: - s.mk_from_src(d, ['sys.path']) + s.src_syspath(d, ['sys.path']) + for m in sys.modules.values(): + s.src_module(m, ['sys.modules']) + s.report_from_packages(s, s._package_files) def mk_portmanteau(s): cmdl = s.rune_shell + [ s.rune_portmanteau, 'x', s.output_name, s.manifest_name ] mfh = s.open_output_fh(s.manifest_name,'w') - for (name, info) in s._manifest: - cmdl.append(name) - print('%s\t%s' % (name,info), file=mfh) + for me in s._manifest: + try: fname = me['file'] + except KeyError: fname = me.get('file_print','') + else: cmdl.append(name) + print('%s\t%s' % (fname, me['info']), file=mfh) mfh.close() - subprocess.run(s.rune_shell + cmdl, + subprocess.run(cmdl, cwd=s._destdir, stdin=subprocess.DEVNULL, stdout=sys.stderr, @@ -152,5 +259,5 @@ class SourceShipmentPreparer(): check=True) def generate(s): - s.mk_from_srcs() + s.srcs_allitems() s.mk_portmanteau()