Mercurial > treepkg > treepkg
diff treepkg/packager.py @ 52:78cf5f6778ec
Rename 'packagel ine' -> 'package track'
author | Bernhard Herzog <bh@intevation.de> |
---|---|
date | Tue, 03 Apr 2007 20:33:33 +0200 |
parents | 38d66dc6a1e5 |
children | 74cd21b6400b |
line wrap: on
line diff
--- a/treepkg/packager.py Tue Apr 03 11:24:48 2007 +0200 +++ b/treepkg/packager.py Tue Apr 03 20:33:33 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, pkg_track, status, work_dir, src_dir, revision): + self.pkg_track = pkg_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.pkg_track.export_sources(temp_dir) pkgbaseversion = self.determine_package_version(temp_dir) pkgbasedir = os.path.join(self.work_dir, @@ -113,7 +113,7 @@ debian_dir = os.path.join(pkgbasedir, "debian") changelog = os.path.join(debian_dir, "changelog") - self.pkg_line.copy_debian_directory(debian_dir) + self.pkg_track.copy_debian_directory(debian_dir) logging.info("Updating %r", changelog) oldversion = util.debian_changelog_version(changelog) @@ -124,7 +124,7 @@ run.call(["debchange", "-c", changelog, "-v", oldversionprefix + pkgbaseversion + "-kk1", changemsg], - env=self.pkg_line.debian_environment()) + env=self.pkg_track.debian_environment()) def create_source_package(self, pkgbasedir, origtargz): @@ -134,7 +134,7 @@ os.path.basename(origtargz)], cwd=os.path.dirname(pkgbasedir), suppress_output=True, - env=self.pkg_line.debian_environment()) + env=self.pkg_track.debian_environment()) def move_source_package(self, pkgbasename): """Moves the new source package from the work_dir to the src_dir""" @@ -174,8 +174,8 @@ class BinaryPackager(object): - def __init__(self, pkg_line, status, binary_dir, dsc_file, logfile): - self.pkg_line = pkg_line + def __init__(self, pkg_track, status, binary_dir, dsc_file, logfile): + self.pkg_track = pkg_track self.status = status self.binary_dir = binary_dir self.dsc_file = dsc_file @@ -186,10 +186,10 @@ util.ensure_directory(self.binary_dir) logging.info("Building binary package; loging to %r", self.logfile) cmd = ["/usr/sbin/pbuilder", "build", - "--configfile", self.pkg_line.pbuilderrc, + "--configfile", self.pkg_track.pbuilderrc, "--logfile", self.logfile, "--buildresult", self.binary_dir, self.dsc_file] - run.call(self.pkg_line.root_cmd + cmd, suppress_output=True) + run.call(self.pkg_track.root_cmd + cmd, suppress_output=True) self.status.binary_package_created() @@ -198,10 +198,10 @@ source_packager_cls = SourcePackager binary_packager_cls = BinaryPackager - def __init__(self, pkg_line, revision): - self.pkg_line = pkg_line + def __init__(self, pkg_track, revision): + self.pkg_track = pkg_track self.revision = revision - self.base_dir = self.pkg_line.pkg_dir_for_revision(self.revision, 1) + self.base_dir = self.pkg_track.pkg_dir_for_revision(self.revision, 1) self.status = status.RevisionStatus(os.path.join(self.base_dir, "status")) @@ -223,7 +223,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.pkg_track, self.status, self.work_dir, self.src_dir, self.revision) src_packager.package() @@ -232,7 +232,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.pkg_track, self.status, self.binary_dir, dsc_file, self.build_log) bin_packager.package() @@ -247,7 +247,7 @@ shutil.rmtree(self.base_dir) -class PackageLine(object): +class PackageTrack(object): revision_packager_cls = RevisionPackager @@ -364,15 +364,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): @@ -383,7 +383,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() @@ -395,17 +395,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