Mercurial > treepkg > treepkg
diff treepkg/packager.py @ 299:c32dc72ba979
Turn the SourcePackager class attribute pkg_basename into a per-track
configuratin option. The default value is the track name, as in most
cases they're identical anyway. For now, the change is compatible with
old SourcePackager subclasses that override pkg_basename.
| author | Bernhard Herzog <bh@intevation.de> |
|---|---|
| date | Fri, 20 Nov 2009 21:06:10 +0000 |
| parents | 4dd6ec3a1151 |
| children | e82fb08781a2 |
line wrap: on
line diff
--- a/treepkg/packager.py Fri Nov 20 20:22:34 2009 +0000 +++ b/treepkg/packager.py Fri Nov 20 21:06:10 2009 +0000 @@ -32,13 +32,10 @@ class SourcePackager(object): - # Derived classes must supply the package basename - pkg_basename = None - # Derived classes may want to override this message changemsg_template = "Update to revision %(revision)d" - + pkg_basename = property(lambda self: self.track.pkg_basename) track = _fromparent("track") revision = _fromparent("revision") pkg_revision = _fromparent("pkg_revision") @@ -49,7 +46,6 @@ def __init__(self, parent): self.parent = parent - assert(self.pkg_basename) def determine_package_version(self, directory): """Returns the version number of the new package as a string @@ -349,8 +345,11 @@ deb_fullname, packager_class="treepkg.packager", pkg_revision_template="treepkg%(pkg_revision)d", handle_dependencies=False, signing_key_id="", do_build=True, - rules_svn_url=None, deb_build_options=""): + rules_svn_url=None, deb_build_options="", pkg_basename=""): self.name = name + if not pkg_basename: + pkg_basename = name + self.pkg_basename = pkg_basename self.base_dir = base_dir self.builder = PBuilder(pbuilderrc, root_cmd, release_signing_keyid=signing_key_id)