import gzip
import bz2
import apt_pkg
+import subprocess
from tempfile import mkstemp, mkdtemp
import commands
from sqlalchemy.orm import object_session
from daklib.dbconn import *
from daklib.config import Config
from daklib.dakmultiprocessing import DakProcessPool, PROC_STATUS_SUCCESS
+import daklib.daksubprocess
################################################################################
Logger = None #: Our logging object
-f, --force Allow processing of untouchable suites
CAREFUL: Only to be used at (point) release time!
-h, --help show this help and exit
+ -q, --quiet Don't output progress
-SUITE can be a space seperated list, e.g.
+SUITE can be a space separated list, e.g.
--suite=unstable testing
"""
sys.exit(exit_code)
if cnf.has_key("Dinstall::SigningPubKeyring"):
keyring += " --keyring \"%s\"" % cnf["Dinstall::SigningPubKeyring"]
- arguments = "--no-options --batch --no-tty --armour"
+ arguments = "--no-options --batch --no-tty --armour --personal-digest-preferences=SHA256"
relname = os.path.join(dirname, 'Release')
if os.path.exists(inlinedest):
os.unlink(inlinedest)
- # We can only use one key for inline signing so use the first one in
- # the array for consistency
- firstkey = True
-
+ defkeyid=""
for keyid in suite.signingkeys or []:
- defkeyid = "--default-key %s" % keyid
-
- os.system("gpg %s %s %s --detach-sign <%s >>%s" %
- (keyring, defkeyid, arguments, relname, dest))
-
- if firstkey:
- os.system("gpg %s %s %s --clearsign <%s >>%s" %
- (keyring, defkeyid, arguments, relname, inlinedest))
- firstkey = False
+ defkeyid += "--local-user %s " % keyid
+
+ os.system("gpg %s %s %s --detach-sign <%s >>%s" %
+ (keyring, defkeyid, arguments, relname, dest))
+ os.system("gpg %s %s %s --clearsign <%s >>%s" %
+ (keyring, defkeyid, arguments, relname, inlinedest))
+
+class XzFile(object):
+ def __init__(self, filename, mode='r'):
+ self.filename = filename
+ def read(self):
+ cmd = ("xz", "-d")
+ with open(self.filename, 'r') as stdin:
+ process = daklib.daksubprocess.Popen(cmd, stdin=stdin, stdout=subprocess.PIPE)
+ (stdout, stderr) = process.communicate()
+ return stdout
class ReleaseWriter(object):
def __init__(self, suite):
# fill them in
attribs = ( ('Origin', 'origin'),
('Label', 'label'),
- ('Suite', 'suite_name'),
+ ('Suite', 'release_suite_output'),
('Version', 'version'),
- ('Codename', 'codename') )
+ ('Codename', 'codename'),
+ ('Changelogs', 'changelog_url'),
+ )
# A "Sub" Release file has slightly different fields
subattribs = ( ('Archive', 'suite_name'),
out = open(outfile + ".new", "w")
for key, dbfield in attribs:
- if getattr(suite, dbfield) is not None:
- # TEMPORARY HACK HACK HACK until we change the way we store the suite names etc
- if key == 'Suite' and getattr(suite, dbfield) == 'squeeze-updates':
- out.write("Suite: stable-updates\n")
- elif key == 'Suite' and getattr(suite, dbfield) == 'wheezy-updates':
- out.write("Suite: testing-updates\n")
- else:
- out.write("%s: %s\n" % (key, getattr(suite, dbfield)))
+ # Hack to skip NULL Version fields as we used to do this
+ # We should probably just always ignore anything which is None
+ if key in ("Version", "Changelogs") and getattr(suite, dbfield) is None:
+ continue
+
+ out.write("%s: %s\n" % (key, getattr(suite, dbfield)))
out.write("Date: %s\n" % (time.strftime("%a, %d %b %Y %H:%M:%S UTC", time.gmtime(time.time()))))
out.write("Architectures: %s\n" % (" ".join([a.arch_string for a in architectures])))
- components = [ c.component_name for c in session.query(Component) ]
+ components = [ c.component_name for c in suite.components ]
- out.write("Components: %s\n" % ( " ".join(map(lambda x: "%s%s" % (suite_suffix, x), components ))))
+ out.write("Components: %s\n" % (" ".join(components)))
# For exact compatibility with old g-r, write out Description here instead
# of with the rest of the DB fields above
# If we find a file for which we have a compressed version and
# haven't yet seen the uncompressed one, store the possibility
# for future use
- if entry.endswith(".gz") and entry[:-3] not in uncompnotseen.keys():
+ if entry.endswith(".gz") and filename[:-3] not in uncompnotseen:
uncompnotseen[filename[:-3]] = (gzip.GzipFile, filename)
- elif entry.endswith(".bz2") and entry[:-4] not in uncompnotseen.keys():
+ elif entry.endswith(".bz2") and filename[:-4] not in uncompnotseen:
uncompnotseen[filename[:-4]] = (bz2.BZ2File, filename)
+ elif entry.endswith(".xz") and filename[:-3] not in uncompnotseen:
+ uncompnotseen[filename[:-3]] = (XzFile, filename)
fileinfo[filename]['len'] = len(contents)
for filename, comp in uncompnotseen.items():
# If we've already seen the uncompressed file, we don't
# need to do anything again
- if filename in fileinfo.keys():
- continue
-
- # Skip uncompressed Contents files as they're huge, take ages to
- # checksum and we checksum the compressed ones anyways
- if os.path.basename(filename).startswith("Contents"):
+ if filename in fileinfo:
continue
fileinfo[filename] = {}
cnf = Config()
- for i in ["Help", "Suite", "Force"]:
+ for i in ["Help", "Suite", "Force", "Quiet"]:
if not cnf.has_key("Generate-Releases::Options::%s" % (i)):
cnf["Generate-Releases::Options::%s" % (i)] = ""
('a','archive','Generate-Releases::Options::Archive','HasArg'),
('s',"suite","Generate-Releases::Options::Suite"),
('f',"force","Generate-Releases::Options::Force"),
+ ('q',"quiet","Generate-Releases::Options::Quiet"),
('o','option','','ArbItem')]
suite_names = apt_pkg.parse_commandline(cnf.Cnf, Arguments, sys.argv)
print "Skipping %s (untouchable)" % s.suite_name
continue
- print "Processing %s" % s.suite_name
+ if not Options["Quiet"]:
+ print "Processing %s" % s.suite_name
Logger.log(['Processing release file for Suite: %s' % (s.suite_name)])
pool.apply_async(generate_helper, (s.suite_id, ))
projects / dak.git / blobdiff