Mercurial > treepkg > treepkg
comparison treepkg/packager.py @ 504:dcec034fed97
Remove the type for the additionals variable in determine_package_version
altogether.
| author | Andre Heinecke <aheinecke@intevation.de> |
|---|---|
| date | Mon, 25 Oct 2010 14:30:08 +0000 |
| parents | 44a005311f62 |
| children | 1f04bd88fca3 |
comparison
equal
deleted
inserted
replaced
| 503:44a005311f62 | 504:dcec034fed97 |
|---|---|
| 26 import status | 26 import status |
| 27 import debian | 27 import debian |
| 28 from cmdexpand import cmdexpand | 28 from cmdexpand import cmdexpand |
| 29 from builder import PBuilder | 29 from builder import PBuilder |
| 30 from sbuilder import SbdmockBuilder | 30 from sbuilder import SbdmockBuilder |
| 31 from types import DictType | |
| 32 | 31 |
| 33 def _fromparent(attr): | 32 def _fromparent(attr): |
| 34 """Creates a property that delegates its value to self.parent.<attr>""" | 33 """Creates a property that delegates its value to self.parent.<attr>""" |
| 35 def get(self): | 34 def get(self): |
| 36 return getattr(self.parent, attr) | 35 return getattr(self.parent, attr) |
| 117 localtime = time.localtime() | 116 localtime = time.localtime() |
| 118 pkg_date = time.strftime("%Y%m%d", localtime) | 117 pkg_date = time.strftime("%Y%m%d", localtime) |
| 119 pkg_time = time.strftime("%H%M", localtime) | 118 pkg_time = time.strftime("%H%M", localtime) |
| 120 upstream_version = self.determine_upstream_version(directory) | 119 upstream_version = self.determine_upstream_version(directory) |
| 121 version_dict = locals().copy() | 120 version_dict = locals().copy() |
| 122 if type(additionals) is DictType: | 121 if additionals: |
| 123 version_dict.update(additionals) | 122 version_dict.update(additionals) |
| 124 return self.track.version_template % version_dict | 123 return self.track.version_template % version_dict |
| 125 | 124 |
| 126 def export_sources(self): | 125 def export_sources(self): |
| 127 """Export the sources from the subversion working directory | 126 """Export the sources from the subversion working directory |