Mercurial > treepkg > treepkg
diff treepkg/packager.py @ 55:6b5f7f7575f6
merge
author | Bernhard Herzog <bh@intevation.de> |
---|---|
date | Tue, 10 Apr 2007 12:07:39 +0200 |
parents | e1028211d34b b0014b8f6029 |
children | 9a602d8eaa60 |
line wrap: on
line diff
--- a/treepkg/packager.py Tue Apr 03 16:09:35 2007 +0200 +++ b/treepkg/packager.py Tue Apr 10 12:07:39 2007 +0200 @@ -32,8 +32,8 @@ # Derived classes must supply the package basename pkg_basename = None - def __init__(self, pkg_line, status, work_dir, src_dir, revision): - self.pkg_line = pkg_line + def __init__(self, track, status, work_dir, src_dir, revision): + self.track = track self.status = status self.work_dir = work_dir self.src_dir = src_dir @@ -64,7 +64,7 @@ is the return value of the determine_package_version() method. """ temp_dir = os.path.join(self.work_dir, "temp") - self.pkg_line.export_sources(temp_dir) + self.track.export_sources(temp_dir) pkgbaseversion = self.determine_package_version(temp_dir) pkgbasedir = os.path.join(self.work_dir, @@ -114,7 +114,7 @@ debian_dir = os.path.join(pkgbasedir, "debian") changelog = os.path.join(debian_dir, "changelog") - self.pkg_line.copy_debian_directory(debian_dir) + self.track.copy_debian_directory(debian_dir) logging.info("Updating %r", changelog) oldversion = util.debian_changelog_version(changelog) @@ -125,7 +125,7 @@ run.call(cmdexpand("debchange -c $changelog" " -v ${oldversionprefix}${pkgbaseversion}-kk1" " $changemsg", **locals()), - env=self.pkg_line.debian_environment()) + env=self.track.debian_environment()) def create_source_package(self, pkgbasedir, origtargz): @@ -136,7 +136,7 @@ tarball=os.path.basename(origtargz)), cwd=os.path.dirname(pkgbasedir), suppress_output=True, - env=self.pkg_line.debian_environment()) + env=self.track.debian_environment()) def move_source_package(self, pkgbasename): """Moves the new source package from the work_dir to the src_dir""" @@ -176,8 +176,8 @@ class BinaryPackager(object): - def __init__(self, pkg_line, status, binary_dir, dsc_file, logfile): - self.pkg_line = pkg_line + def __init__(self, track, status, binary_dir, dsc_file, logfile): + self.track = track self.status = status self.binary_dir = binary_dir self.dsc_file = dsc_file @@ -186,12 +186,12 @@ def package(self): self.status.creating_binary_package() util.ensure_directory(self.binary_dir) - logging.info("Building binary package; loging to %r", self.logfile) + logging.info("Building binary package; logging to %r", self.logfile) run.call(cmdexpand("@rootcmd /usr/sbin/pbuilder build" " --configfile $pbuilderrc" " --logfile $logfile --buildresult $bindir $dsc", - rootcmd=self.pkg_line.root_cmd, - pbuilderrc=self.pkg_line.pbuilderrc, + rootcmd=self.track.root_cmd, + pbuilderrc=self.track.pbuilderrc, logfile=self.logfile, bindir=self.binary_dir, dsc=self.dsc_file), suppress_output=True) @@ -203,10 +203,10 @@ source_packager_cls = SourcePackager binary_packager_cls = BinaryPackager - def __init__(self, pkg_line, revision): - self.pkg_line = pkg_line + def __init__(self, track, revision): + self.track = track self.revision = revision - self.base_dir = self.pkg_line.pkg_dir_for_revision(self.revision, 1) + self.base_dir = self.track.pkg_dir_for_revision(self.revision, 1) self.status = status.RevisionStatus(os.path.join(self.base_dir, "status")) @@ -228,7 +228,7 @@ try: util.ensure_directory(self.work_dir) self.status.start = datetime.datetime.utcnow() - src_packager = self.source_packager_cls(self.pkg_line, self.status, + src_packager = self.source_packager_cls(self.track, self.status, self.work_dir, self.src_dir, self.revision) src_packager.package() @@ -237,7 +237,7 @@ if dsc_file is None: raise RuntimeError("Cannot find dsc File in %r" % self.src_dir) - bin_packager = self.binary_packager_cls(self.pkg_line, self.status, + bin_packager = self.binary_packager_cls(self.track, self.status, self.binary_dir, dsc_file, self.build_log) bin_packager.package() @@ -252,7 +252,7 @@ shutil.rmtree(self.base_dir) -class PackageLine(object): +class PackageTrack(object): revision_packager_cls = RevisionPackager @@ -369,15 +369,15 @@ for revision in self.get_revision_numbers()] -def create_package_line(packager_class, **kw): +def create_package_track(packager_class, **kw): module = util.import_dotted_name(packager_class) - return module.PackageLine(**kw) + return module.PackageTrack(**kw) class PackagerGroup(object): - def __init__(self, package_lines, check_interval): - self.package_lines = package_lines + def __init__(self, package_tracks, check_interval): + self.package_tracks = package_tracks self.check_interval = check_interval def run(self): @@ -388,7 +388,7 @@ while 1: now = time.time() if now > last_check + self.check_interval: - self.check_package_lines() + self.check_package_tracks() last_check = now next_check = now + self.check_interval to_sleep = next_check - time.time() @@ -400,17 +400,17 @@ else: logging.info("Next check now") - def check_package_lines(self): - logging.info("Checking package lines") - for line in self.package_lines: + def check_package_tracks(self): + logging.info("Checking package tracks") + for track in self.package_tracks: try: - packager = line.package_if_updated() + packager = track.package_if_updated() if packager: packager.package() except: logging.exception("An error occurred while" - " checking packager line %r", line.name) - logging.info("Checked all package lines") + " checking packager track %r", track.name) + logging.info("Checked all package tracks") - def get_package_lines(self): - return self.package_lines + def get_package_tracks(self): + return self.package_tracks