#
# Copyright 2017 Ian Jackson
#
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Affero General Public License as
-# published by the Free Software Foundation, either version 3 of the
-# License, or (at your option) any later version, with the "CAF Login
-# Exception" as published by Ian Jackson (version 2, or at your option
-# any later version) as an Additional Permission.
+# AGPLv3+ + CAFv2+
#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU Affero General Public License for more details.
+# This program is free software: you can redistribute it and/or
+# modify it under the terms of the GNU Affero General Public
+# License as published by the Free Software Foundation, either
+# version 3 of the License, or (at your option) any later version,
+# with the "CAF Login Exception" as published by Ian Jackson
+# (version 2, or at your option any later version) as an Additional
+# Permission.
#
-# You should have received a copy of the GNU Affero General Public
-# License and the CAF Login Exception along with this program, in the
-# file AGPLv3+CAFv2. If not, email Ian Jackson
-# <ijackson@chiark.greenend.org.uk>.
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+# Affero General Public License for more details.
+#
+# You should have received a copy of the GNU Affero General Public
+# License and the CAF Login Exception along with this program, in
+# the file AGPLv3+CAFv2. If not, email Ian Jackson
+# <ijackson@chiark.greenend.org.uk>.
import os
import stat
import subprocess
import tempfile
+import shutil
+
+try: import debian.deb822
+except ImportError: pass
class SourceShipmentPreparer():
def __init__(s, destdir):
# caller may modify, and should read after calling generate()
- s.output_name = 'srcbomb.tar.gz'
- # s.output_path alternatively caller may read this
+ 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)
s.src_filter = s.src_filter_glob
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
+ s.stream_stderr = sys.stderr
+ s.stream_debug = open('/dev/null','w')
s.rune_cpio = r'''
set -o pipefail
(
)
'''
s.rune_portmanteau = r'''
- outfile=$1; shift
- rm -f "$outfile"
- GZIP=-1 tar zcf "$outfile" "$@"
+ GZIP=-1 tar zcf - "$@"
+ '''
+ s.rune_portmanteau_uncompressed = r'''
+ tar cf - "$@"
'''
s.manifest_name='0000-MANIFEST.txt'
# private
s._manifest = []
s._dirmap = { }
s._package_files = { } # map filename => infol
+ s._packages_path = os.path.join(s._destdir, 'packages')
+ s._package_sources = []
def thing_matches_globs(s, thing, globs):
for pat in globs:
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):
def srcdir_find_rune(s, d):
script = s.find_rune_base
- ignores = s.ignores + [s.output_name, s.manifest_name]
+ ignores = s.ignores + s.output_names + [s.manifest_name]
ignores += s.src_direxcludes(d)
for excl in ignores:
assert("'" not in excl)
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')
assert(dpkg_S.wait() == 0)
dpkg_show_in.seek(0)
cmdl = ['xargs','-r','dpkg-query',
- r'-f${binary:Package}\t${Package}\t${Architecture}\t${Version}\t${source:Package}\t${source:Version}\n',
+ r'-f${binary:Package}\t${Package}\t${Architecture}\t${Version}\t${source:Package}\t${source:Version}\t${source:Upstream-Version}\n',
'--show','--']
dpkg_show = subprocess.Popen(cmdl,
cwd='/',
close_fds=False)
for l in dpkg_show.stdout:
l = l.strip(b'\n').decode('utf-8')
- (pk,p,a,v,sp,sv) = l.split('\t')
+ (pk,p,a,v,sp,sv,suv) = l.split('\t')
pkginfos[pk]['binary'] = p
pkginfos[pk]['arch'] = a
pkginfos[pk]['version'] = v
pkginfos[pk]['source'] = sp
pkginfos[pk]['sourceversion'] = sv
+ pkginfos[pk]['sourceupstreamversion'] = sv
assert(dpkg_show.wait() == 0)
for pk in sorted(pkginfos.keys()):
pi = pkginfos[pk]
if s.show_pathnames: infol = infol + ['loaded='+fname]
s.manifest_append_absentfile(' \t' + debfname, infol)
+ if s.download_packages:
+ try: os.mkdir(s._packages_path)
+ except FileExistsError: pass
+
+ cmdl = ['apt-get','--download-only','source',
+ '%s=%s' % (pi['source'], pi['sourceversion'])]
+ subprocess.run(cmdl,
+ cwd=s._packages_path,
+ stdin=subprocess.DEVNULL,
+ stdout=s.stream_debug,
+ stderr=s.stream_stderr,
+ restore_signals=True,
+ check=True)
+
+ s._package_sources.append(dscfname)
+ dsc = debian.deb822.Dsc(open(s._packages_path + '/' + dscfname))
+ for indsc in dsc['Files']:
+ s._package_sources.append(indsc['name'])
+
def thing_ought_packaged(s, fname):
return s.thing_matches_globs(fname, s.src_package_globs)
s.report_from_packages(s._package_files)
s.logger('allitems done')
- def mk_portmanteau(s):
- s.logger('making portmanteau')
- cmdl = s.rune_shell + [ s.rune_portmanteau, 'x',
- s.output_name, s.manifest_name ]
+ def _mk_portmanteau(s, ix, rune, cwd, files):
+ output_name = s.output_names[ix]
+ s.logger('making portmanteau %s' % output_name)
+ output_path = os.path.join(s._destdir, output_name)
+ subprocess.run(s.rune_shell + [ rune, 'x' ] + files,
+ cwd=cwd,
+ stdin=subprocess.DEVNULL,
+ stdout=open(output_path, 'wb'),
+ restore_signals=True,
+ check=True)
+ s.output_paths[ix] = output_path
+
+ def mk_inner_portmanteau(s):
+ outputs = [s.manifest_name]
+ outputs_done = { }
mfh = s.open_output_fh(s.manifest_name,'w')
for me in s._manifest:
try: fname = me['file']
except KeyError: fname = me.get('file_print','')
- else: cmdl.append(fname)
+ else:
+ try: outputs_done[fname]
+ except KeyError:
+ outputs.append(fname)
+ outputs_done[fname] = 1
print('%s\t%s' % (fname, me['info']), file=mfh)
mfh.close()
- subprocess.run(cmdl,
- cwd=s._destdir,
- stdin=subprocess.DEVNULL,
- stdout=sys.stderr,
- restore_signals=True,
- check=True)
- s.output_path = os.path.join(s._destdir, s.output_name)
- s.logger('portmanteau ready in %s' % s.output_path)
+
+ s._mk_portmanteau(0, s.rune_portmanteau,
+ s._destdir, outputs)
+
+ def mk_packages_portmanteau(s):
+ s._mk_portmanteau(1, s.rune_portmanteau_uncompressed,
+ s._packages_path, s._package_sources)
def generate(s):
s.srcs_allitems()
- s.mk_portmanteau()
+ s.mk_inner_portmanteau()
+ s.mk_packages_portmanteau()
+ s.logger('portmanteau ready in %s %s' % tuple(s.output_paths))
~ian / hippotat.git / blobdiff