Mercurial > treepkg
changeset 327:f5282057838a
Revisions are now handled as strings
| author | Andre Heinecke <aheinecke@intevation.de> |
|---|---|
| date | Wed, 17 Mar 2010 13:42:42 +0000 |
| parents | 23be5ab5bc7c |
| children | dd2bd0ccd674 |
| files | recipes/gnupg/base.py recipes/wince/gnupg/base.py |
| diffstat | 2 files changed, 8 insertions(+), 8 deletions(-) [+] |
line wrap: on
line diff
--- a/recipes/gnupg/base.py Wed Mar 17 13:38:37 2010 +0000 +++ b/recipes/gnupg/base.py Wed Mar 17 13:42:42 2010 +0000 @@ -44,7 +44,7 @@ % filename) def determine_package_version(self, directory): - return "%s+svn%d" % (self.orig_source_version(directory), self.revision) + return "%s+svn%s" % (self.orig_source_version(directory), self.revision) def do_package(self): pkgbaseversion, pkgbasedir = self.export_sources() @@ -59,7 +59,7 @@ # thus could not find the svn revision. treepkg.util.replace_in_file(os.path.join(pkgbasedir, "configure"), re.escape(orig_version) + "-svn0", - orig_version + "-svn%d" % self.revision) + orig_version + "-svn%s" % self.revision) pkgbasename = self.pkg_basename + "_" + pkgbaseversion origtargz = os.path.join(self.work_dir, @@ -67,7 +67,7 @@ self.create_tarball(origtargz, self.work_dir, os.path.basename(pkgbasedir)) - changemsg = ("Update to SVN rev. %d" % (self.revision,)) + changemsg = ("Update to SVN rev. %s" % (self.revision,)) self.copy_debian_directory(pkgbasedir, pkgbaseversion, changemsg) @@ -181,7 +181,7 @@ self.create_original_tarball() orig_dir = self.create_orig_dir() - changemsg = ("Update to SVN rev. %d" % (self.revision,)) + changemsg = ("Update to SVN rev. %s" % (self.revision,)) self.copy_debian_directory(orig_dir, self.pkgbaseversion, changemsg) self.create_source_package(orig_dir, self.origtargz)
--- a/recipes/wince/gnupg/base.py Wed Mar 17 13:38:37 2010 +0000 +++ b/recipes/wince/gnupg/base.py Wed Mar 17 13:42:42 2010 +0000 @@ -45,7 +45,7 @@ % filename) def determine_package_version(self, directory): - return "%s-svn%d" % (self.orig_source_version(directory), self.revision) + return "%s-svn%s" % (self.orig_source_version(directory), self.revision) def sign_package(self): return None @@ -62,7 +62,7 @@ # thus could not find the svn revision. treepkg.util.replace_in_file(os.path.join(pkgbasedir, "configure"), re.escape(orig_version) + "-svn0", - orig_version + "-svn%d" % self.revision) + orig_version + "-svn%s" % self.revision) pkgbasename = self.pkg_basename + "_" + pkgbaseversion origtargz = os.path.join(self.work_dir, @@ -70,7 +70,7 @@ self.create_tarball(origtargz, self.work_dir, os.path.basename(pkgbasedir)) - changemsg = ("Update to SVN rev. %d" % (self.revision,)) + changemsg = ("Update to SVN rev. %s" % (self.revision,)) self.copy_debian_directory(pkgbasedir, pkgbaseversion, changemsg) @@ -191,7 +191,7 @@ self.create_original_tarball() orig_dir = self.create_orig_dir() - changemsg = ("Update to SVN rev. %d" % (self.revision,)) + changemsg = ("Update to SVN rev. %s" % (self.revision,)) self.copy_debian_directory(orig_dir, self.pkgbaseversion, changemsg) self.create_source_package(orig_dir, self.origtargz)