Mercurial > treepkg > treepkg
comparison treepkg/packager.py @ 532:9c8e2c05c775
add more substituteable variables for changelog message
author | Bjoern Ricks <bricks@intevation.de> |
---|---|
date | Wed, 22 Dec 2010 16:44:04 +0000 |
parents | de78084fcbce |
children | 3d8709da5fc2 |
comparison
equal
deleted
inserted
replaced
531:b5e0c81c9bcc | 532:9c8e2c05c775 |
---|---|
54 work_dir = _fromparent("work_dir") | 54 work_dir = _fromparent("work_dir") |
55 src_dir = _fromparent("src_dir") | 55 src_dir = _fromparent("src_dir") |
56 | 56 |
57 def __init__(self, parent): | 57 def __init__(self, parent): |
58 self.parent = parent | 58 self.parent = parent |
59 self.rules_revision = self.parent.rules_revision | |
60 self.pkg_revision = self.parent.pkg_revision | |
61 self.short_revision = self.revision | |
62 if len(self.pkg_revision) > 7: | |
63 self.short_revision = self.short_revision[:7] | |
64 localtime = time.localtime() | |
65 self.pkg_date = time.strftime("%Y%m%d", localtime) | |
66 self.pkg_time = time.strftime("%H%M", localtime) | |
59 | 67 |
60 def determine_upstream_version(self, directory=None): | 68 def determine_upstream_version(self, directory=None): |
61 """ | 69 """ |
62 Tries to parse the upstream version from a source directory | 70 Tries to parse the upstream version from a source directory |
63 and returns it as a string. | 71 and returns it as a string. |
111 upstream_version - The version parsed from the sources or | 119 upstream_version - The version parsed from the sources or |
112 package descriptions by | 120 package descriptions by |
113 determine_upstream_version. Default: "0" | 121 determine_upstream_version. Default: "0" |
114 """ | 122 """ |
115 revision = self.revision | 123 revision = self.revision |
116 rules_revision = self.parent.rules_revision | 124 rules_revision = self.rules_revision |
117 pkg_revision = self.parent.pkg_revision | 125 pkg_revision = self.pkg_revision |
118 short_revision = revision | 126 short_revision = self.short_revision |
119 if len(pkg_revision) > 7: | 127 pkg_date = self.pkg_date |
120 short_revision = short_revision[:7] | 128 pkg_time = self.pkg_time |
121 localtime = time.localtime() | |
122 pkg_date = time.strftime("%Y%m%d", localtime) | |
123 pkg_time = time.strftime("%H%M", localtime) | |
124 upstream_version = self.determine_upstream_version(directory) | 129 upstream_version = self.determine_upstream_version(directory) |
125 version_dict = locals().copy() | 130 version_dict = locals().copy() |
126 if additionals: | 131 if additionals: |
127 version_dict.update(additionals) | 132 version_dict.update(additionals) |
128 return self.track.version_template % version_dict | 133 return self.track.version_template % version_dict |
302 | 307 |
303 self.create_source_package(pkgbasedir, origtargz) | 308 self.create_source_package(pkgbasedir, origtargz) |
304 self.move_source_package(pkgbasename) | 309 self.move_source_package(pkgbasename) |
305 | 310 |
306 def get_change_msg(self): | 311 def get_change_msg(self): |
307 return self.changemsg_template % dict(revision=self.revision) | 312 return self.changemsg_template % dict(revision=self.revision, |
313 pkg_date=self.pkg_date, pkg_time=self.pkg_time, | |
314 rules_revision=self.rules_revision) | |
308 | 315 |
309 class BinaryPackager(object): | 316 class BinaryPackager(object): |
310 | 317 |
311 track = _fromparent("track") | 318 track = _fromparent("track") |
312 status = _fromparent("status") | 319 status = _fromparent("status") |