Mercurial > treepkg > treepkg
comparison treepkg/packager.py @ 93:73c67372c7f7
Make the prefix used in the debian revision number configurable.
This involves a new config file setting documented in demo.cfg, the
necessary changes to the packagers and updated and new test cases
| author | Bernhard Herzog <bh@intevation.de> |
|---|---|
| date | Wed, 07 Nov 2007 10:13:24 +0000 |
| parents | 3ed079a7174a |
| children | f7b9c7113c46 |
comparison
equal
deleted
inserted
replaced
| 92:1c74e3b56a63 | 93:73c67372c7f7 |
|---|---|
| 119 oldversion = util.debian_changelog_version(changelog) | 119 oldversion = util.debian_changelog_version(changelog) |
| 120 if ":" in oldversion: | 120 if ":" in oldversion: |
| 121 oldversionprefix = oldversion.split(":")[0] + ":" | 121 oldversionprefix = oldversion.split(":")[0] + ":" |
| 122 else: | 122 else: |
| 123 oldversionprefix = "" | 123 oldversionprefix = "" |
| 124 debrev = self.track.debrevision_prefix + "1" | |
| 124 run.call(cmdexpand("debchange -c $changelog" | 125 run.call(cmdexpand("debchange -c $changelog" |
| 125 " -v ${oldversionprefix}${pkgbaseversion}-kk1" | 126 " -v ${oldversionprefix}${pkgbaseversion}-${debrev}" |
| 126 " $changemsg", **locals()), | 127 " $changemsg", **locals()), |
| 127 env=self.track.debian_environment()) | 128 env=self.track.debian_environment()) |
| 128 | 129 |
| 129 | 130 |
| 130 def create_source_package(self, pkgbasedir, origtargz): | 131 def create_source_package(self, pkgbasedir, origtargz): |
| 277 svn_external_subdirs = [] | 278 svn_external_subdirs = [] |
| 278 | 279 |
| 279 extra_config_desc = [] | 280 extra_config_desc = [] |
| 280 | 281 |
| 281 def __init__(self, name, base_dir, svn_url, root_cmd, pbuilderrc, deb_email, | 282 def __init__(self, name, base_dir, svn_url, root_cmd, pbuilderrc, deb_email, |
| 282 deb_fullname, packager_class="treepkg.packager"): | 283 deb_fullname, packager_class="treepkg.packager", |
| 284 debrevision_prefix="treepkg"): | |
| 283 self.name = name | 285 self.name = name |
| 284 self.base_dir = base_dir | 286 self.base_dir = base_dir |
| 285 self.svn_url = svn_url | 287 self.svn_url = svn_url |
| 286 self.root_cmd = root_cmd | 288 self.root_cmd = root_cmd |
| 287 self.pbuilderrc = pbuilderrc | 289 self.pbuilderrc = pbuilderrc |
| 288 self.deb_email = deb_email | 290 self.deb_email = deb_email |
| 289 self.deb_fullname = deb_fullname | 291 self.deb_fullname = deb_fullname |
| 292 self.debrevision_prefix = debrevision_prefix | |
| 290 self.pkg_dir_template = "%(revision)d-%(increment)d" | 293 self.pkg_dir_template = "%(revision)d-%(increment)d" |
| 291 self.pkg_dir_regex \ | 294 self.pkg_dir_regex \ |
| 292 = re.compile(r"(?P<revision>[0-9]+)-(?P<increment>[0-9]+)$") | 295 = re.compile(r"(?P<revision>[0-9]+)-(?P<increment>[0-9]+)$") |
| 293 | 296 |
| 294 checkout_dir = _filenameproperty("checkout") | 297 checkout_dir = _filenameproperty("checkout") |