import glob
from daklib import utils
-from daklib.dbconn import get_suite, get_suite_architectures
+from daklib.dbconn import Archive, Component, DBConn, Suite, get_suite, get_suite_architectures
#from daklib.regexes import re_includeinpdiff
import re
re_includeinpdiff = re.compile(r"(Translation-[a-zA-Z_]+\.(?:bz2|xz))")
Write out ed-style diffs to Packages/Source lists
-h, --help show this help and exit
+ -a <archive> generate diffs for suites in <archive>
-c give the canonical path of the file
-p name for the patch (defaults to current time)
- -r use a different archive root
-d name for the hardlink farm for status
-m how many diffs to generate
-n take no action
x = f.readline()
if not x or x[0] != " ": break
l = x.split()
- if not self.history.has_key(l[2]):
- self.history[l[2]] = [None,None]
- self.history_order.append(l[2])
- self.history[l[2]][ind] = (l[0], int(l[1]))
+ fname = l[2]
+ if fname.endswith('.gz'):
+ fname = fname[:-3]
+ if not self.history.has_key(fname):
+ self.history[fname] = [None,None,None]
+ self.history_order.append(fname)
+ self.history[fname][ind] = (l[0], int(l[1]))
return x
while x:
x = read_hashs(1,f,self)
continue
+ if l[0] == "SHA1-Download:":
+ x = read_hashs(2,f,self)
+ continue
+
if l[0] == "Canonical-Name:" or l[0]=="Canonical-Path:":
self.can_path = l[1]
out.write("SHA1-Patches:\n")
for h in l:
out.write(" %s %7d %s\n" % (hs[h][1][0], hs[h][1][1], h))
+ out.write("SHA1-Download:\n")
+ for h in l:
+ if hs[h][2]:
+ out.write(" %s %7d %s.gz\n" % (hs[h][2][0], hs[h][2][1], h))
def create_temp_file(r):
f = tempfile.TemporaryFile()
difsizesha1 = sizesha1(difff)
difff.close()
- upd.history[patchname] = (oldsizesha1, difsizesha1)
+ difffgz = open(difffile + ".gz", "r")
+ difgzsizesha1 = sizesha1(difffgz)
+ difffgz.close()
+
+ upd.history[patchname] = (oldsizesha1, difsizesha1, difgzsizesha1)
upd.history_order.append(patchname)
upd.filesizesha1 = newsizesha1
Cnf = utils.get_conf()
Arguments = [ ('h', "help", "Generate-Index-Diffs::Options::Help"),
+ ('a', 'archive', 'Generate-Index-Diffs::Options::Archive', 'hasArg'),
('c', None, "Generate-Index-Diffs::Options::CanonicalPath", "hasArg"),
('p', "patchname", "Generate-Index-Diffs::Options::PatchName", "hasArg"),
- ('r', "rootdir", "Generate-Index-Diffs::Options::RootDir", "hasArg"),
('d', "tmpdir", "Generate-Index-Diffs::Options::TempDir", "hasArg"),
('m', "maxdiffs", "Generate-Index-Diffs::Options::MaxDiffs", "hasArg"),
('n', "n-act", "Generate-Index-Diffs::Options::NoAct"),
format = "%Y-%m-%d-%H%M.%S"
Options["PatchName"] = time.strftime( format )
- if Options.has_key("RootDir"):
- Cnf["Dir::Root"] = Options["RootDir"]
+ session = DBConn().session()
if not suites:
- suites = Cnf.subtree("Suite").list()
+ query = session.query(Suite.suite_name)
+ if Options.get('Archive'):
+ query = query.join(Suite.archive).filter(Archive.archive_name == Options['Archive'])
+ suites = [ s.suite_name for s in query ]
for suitename in suites:
print "Processing: " + suitename
- SuiteBlock = Cnf.subtree("Suite::" + suitename)
- suiteobj = get_suite(suitename.lower())
+ suiteobj = get_suite(suitename.lower(), session=session)
# Use the canonical version of the suite name
suite = suiteobj.suite_name
print "Skipping: " + suite + " (untouchable)"
continue
- architectures = get_suite_architectures(suite, skipall=True)
-
- if SuiteBlock.has_key("Components"):
- components = SuiteBlock.value_list("Components")
- else:
- print "ALERT: suite %s does not have components set in dak.conf" % (suite)
- continue
+ architectures = get_suite_architectures(suite, skipall=True, session=session)
+ components = [ c.component_name for c in session.query(Component.component_name) ]
suite_suffix = Cnf.find("Dinstall::SuiteSuffix")
if components and suite_suffix:
else:
longsuite = suite
- tree = SuiteBlock.get("Tree", "dists/%s" % (longsuite))
+ tree = os.path.join(suiteobj.archive.path, 'dists', longsuite)
# See if there are Translations which might need a new pdiff
cwd = os.getcwd()
for component in components:
#print "DEBUG: Working on %s" % (component)
- workpath=os.path.join(Cnf["Dir::Root"], tree, component, "i18n")
+ workpath=os.path.join(tree, component, "i18n")
if os.path.isdir(workpath):
os.chdir(workpath)
for dirpath, dirnames, filenames in os.walk(".", followlinks=True, topdown=True):
packages = "Packages"
maxsuite = maxpackages
# Process Contents
- file = "%s/%s/Contents-%s" % (Cnf["Dir::Root"] + tree, component,
- architecture)
+ file = "%s/%s/Contents-%s" % (tree, component, architecture)
storename = "%s/%s_%s_contents_%s" % (Options["TempDir"], suite, component, architecture)
- genchanges(Options, file + ".diff", storename, file, \
- Cnf.get("Suite::%s::Generate-Index-Diffs::MaxDiffs::Contents" % (suite), maxcontents))
+ genchanges(Options, file + ".diff", storename, file, maxcontents)
- file = "%s/%s/%s/%s" % (Cnf["Dir::Root"] + tree,
- component, longarch, packages)
+ file = "%s/%s/%s/%s" % (tree, component, longarch, packages)
storename = "%s/%s_%s_%s" % (Options["TempDir"], suite, component, architecture)
- genchanges(Options, file + ".diff", storename, file, \
- Cnf.get("Suite::%s::Generate-Index-Diffs::MaxDiffs::%s" % (suite, packages), maxsuite))
+ genchanges(Options, file + ".diff", storename, file, maxsuite)
################################################################################
projects / dak.git / blobdiff