import sys
import os
import tempfile
-import subprocess
import time
import apt_pkg
from daklib import utils
-from daklib.dbconn import get_suite
+from daklib.dbconn import get_suite, get_suite_architectures
################################################################################
os.system("bzip2 -d < %s.bz2 > %s" % (f, t))
else:
print "missing: %s" % (f)
- raise IOError, f
+ raise IOError(f)
def smartopen(file):
if os.path.isfile(file):
return
if oldstat[1:3] == origstat[1:3]:
- print "%s: hardlink unbroken, assuming unchanged" % (origfile)
+ #print "%s: hardlink unbroken, assuming unchanged" % (origfile)
return
oldf = smartopen(oldfile)
# should probably early exit if either of these checks fail
# alternatively (optionally?) could just trim the patch history
- if upd.filesizesha1:
- if upd.filesizesha1 != oldsizesha1:
- print "info: old file " + oldfile + " changed! %s %s => %s %s" % (upd.filesizesha1 + oldsizesha1)
+ #if upd.filesizesha1:
+ # if upd.filesizesha1 != oldsizesha1:
+ # print "info: old file " + oldfile + " changed! %s %s => %s %s" % (upd.filesizesha1 + oldsizesha1)
if Options.has_key("CanonicalPath"): upd.can_path=Options["CanonicalPath"]
if newsizesha1 == oldsizesha1:
os.unlink(newfile)
oldf.close()
- print "%s: unchanged" % (origfile)
+ #print "%s: unchanged" % (origfile)
else:
if not os.path.isdir(outdir):
os.mkdir(outdir)
- w = os.popen("diff --ed - %s | gzip -c -9 > %s.gz" %
+ w = os.popen("diff --ed - %s | gzip --rsyncable -c -9 > %s.gz" %
(newfile, difffile), "w")
pipe_file(oldf, w)
oldf.close()
def main():
global Cnf, Options, Logger
- os.umask(0002)
+ os.umask(0o002)
Cnf = utils.get_conf()
Arguments = [ ('h', "help", "Generate-Index-Diffs::Options::Help"),
suiteobj = get_suite(suitename.lower())
# Use the canonical version of the suite name
- suite = suite.suite_name
+ suite = suiteobj.suite_name
if suiteobj.untouchable:
print "Skipping: " + suite + " (untouchable)"
for archobj in architectures:
architecture = archobj.arch_string
- if architecture != "source":
- # Process Contents
- file = "%s/Contents-%s" % (Cnf["Dir::Root"] + tree,
- architecture)
- storename = "%s/%s_contents_%s" % (Options["TempDir"], suite, architecture)
- genchanges(Options, file + ".diff", storename, file, \
- Cnf.get("Suite::%s::Generate-Index-Diffs::MaxDiffs::Contents" % (suite), maxcontents))
-
# use sections instead of components since dak.conf
# treats "foo/bar main" as suite "foo", suitesuffix "bar" and
# component "bar/main". suck.
longarch = "binary-%s"% (architecture)
packages = "Packages"
maxsuite = maxpackages
+ # Process Contents
+ file = "%s/%s/Contents-%s" % (Cnf["Dir::Root"] + 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))
file = "%s/%s/%s/%s" % (Cnf["Dir::Root"] + tree,
component, longarch, packages)