Mercurial > treepkg > treepkg
comparison treepkg/packager.py @ 281:2b9d94f0ccad
Pass the package revision as a parameter to the RevisionPackager
| author | Bernhard Herzog <bh@intevation.de> |
|---|---|
| date | Tue, 04 Aug 2009 10:01:56 +0000 |
| parents | f3dee156e3e3 |
| children | faeeac2c4c71 |
comparison
equal
deleted
inserted
replaced
| 280:d2382953b2c8 | 281:2b9d94f0ccad |
|---|---|
| 39 changemsg_template = "Update to revision %(revision)d" | 39 changemsg_template = "Update to revision %(revision)d" |
| 40 | 40 |
| 41 | 41 |
| 42 track = _fromparent("track") | 42 track = _fromparent("track") |
| 43 revision = _fromparent("revision") | 43 revision = _fromparent("revision") |
| 44 pkg_revision = _fromparent("pkg_revision") | |
| 44 status = _fromparent("status") | 45 status = _fromparent("status") |
| 45 log_dir = _fromparent("log_dir") | 46 log_dir = _fromparent("log_dir") |
| 46 work_dir = _fromparent("work_dir") | 47 work_dir = _fromparent("work_dir") |
| 47 src_dir = _fromparent("src_dir") | 48 src_dir = _fromparent("src_dir") |
| 48 | 49 |
| 141 oldversion = util.debian_changelog_version(changelog) | 142 oldversion = util.debian_changelog_version(changelog) |
| 142 if ":" in oldversion: | 143 if ":" in oldversion: |
| 143 oldversionprefix = oldversion.split(":")[0] + ":" | 144 oldversionprefix = oldversion.split(":")[0] + ":" |
| 144 else: | 145 else: |
| 145 oldversionprefix = "" | 146 oldversionprefix = "" |
| 146 debrev = self.track.debrevision_prefix + "1" | 147 debrev = self.pkg_revision |
| 147 run.call(cmdexpand("debchange -c $changelog" | 148 run.call(cmdexpand("debchange -c $changelog" |
| 148 " -v ${oldversionprefix}${pkgbaseversion}-${debrev}" | 149 " -v ${oldversionprefix}${pkgbaseversion}-${debrev}" |
| 149 " $changemsg", **locals()), | 150 " $changemsg", **locals()), |
| 150 env=self.track.debian_environment()) | 151 env=self.track.debian_environment()) |
| 151 | 152 |
| 243 class RevisionPackager(object): | 244 class RevisionPackager(object): |
| 244 | 245 |
| 245 source_packager_cls = SourcePackager | 246 source_packager_cls = SourcePackager |
| 246 binary_packager_cls = BinaryPackager | 247 binary_packager_cls = BinaryPackager |
| 247 | 248 |
| 248 def __init__(self, track, revision, rules_revision, tag=""): | 249 def __init__(self, track, revision, rules_revision, pkg_revision=None, |
| 250 tag=""): | |
| 249 self.track = track | 251 self.track = track |
| 250 self.revision = revision | 252 self.revision = revision |
| 251 self.rules_revision = rules_revision | 253 self.rules_revision = rules_revision |
| 254 | |
| 255 if pkg_revision is None: | |
| 256 pkg_revision = self.track.debrevision_prefix + "1" | |
| 257 self.pkg_revision = pkg_revision | |
| 258 | |
| 252 self.base_dir = self.track.pkg_dir_for_revision(self.revision, | 259 self.base_dir = self.track.pkg_dir_for_revision(self.revision, |
| 253 rules_revision) | 260 rules_revision) |
| 254 self.status = status.RevisionStatus(os.path.join(self.base_dir, | 261 self.status = status.RevisionStatus(os.path.join(self.base_dir, |
| 255 "status")) | 262 "status")) |
| 256 if tag: | 263 if tag: |