[Treepkg-commits] r263 - in branches/scratchbox: recipes/kde_enterprise_3_5 recipes/kde_enterprise_4 test treepkg
scm-commit@wald.intevation.org
scm-commit at wald.intevation.org
Tue Apr 13 10:52:51 CEST 2010
Author: bricks
Date: 2010-04-13 10:52:50 +0200 (Tue, 13 Apr 2010)
New Revision: 263
Modified:
branches/scratchbox/recipes/kde_enterprise_3_5/base.py
branches/scratchbox/recipes/kde_enterprise_4/base.py
branches/scratchbox/test/test_packager.py
branches/scratchbox/treepkg/subversion.py
Log:
merged trunk changes into branch
Modified: branches/scratchbox/recipes/kde_enterprise_3_5/base.py
===================================================================
--- branches/scratchbox/recipes/kde_enterprise_3_5/base.py 2010-04-08 10:18:49 UTC (rev 262)
+++ branches/scratchbox/recipes/kde_enterprise_3_5/base.py 2010-04-13 08:52:50 UTC (rev 263)
@@ -18,7 +18,7 @@
class BaseSourcePackager(treepkg.packager.SourcePackager):
- changemsg_template = "Update to SVN enterprise35 branch rev. %(revision)d"
+ changemsg_template = "Update to SVN enterprise35 branch rev. %(revision)s"
def __init__(self, *args, **kw):
super(BaseSourcePackager, self).__init__(*args, **kw)
Modified: branches/scratchbox/recipes/kde_enterprise_4/base.py
===================================================================
--- branches/scratchbox/recipes/kde_enterprise_4/base.py 2010-04-08 10:18:49 UTC (rev 262)
+++ branches/scratchbox/recipes/kde_enterprise_4/base.py 2010-04-13 08:52:50 UTC (rev 263)
@@ -19,7 +19,7 @@
class BaseSourcePackager(base35.BaseSourcePackager):
- changemsg_template = "Update to SVN enterprise4 branch rev. %(revision)d"
+ changemsg_template = "Update to SVN enterprise4 branch rev. %(revision)s"
BasePackageTrack = base35.BasePackageTrack
Modified: branches/scratchbox/test/test_packager.py
===================================================================
--- branches/scratchbox/test/test_packager.py 2010-04-08 10:18:49 UTC (rev 262)
+++ branches/scratchbox/test/test_packager.py 2010-04-13 08:52:50 UTC (rev 263)
@@ -51,7 +51,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)
@@ -128,16 +128,16 @@
version = track.last_changed_revision()
# Now check the source and binary package files
- pkgdir = os.path.join(self.trackdir, "pkg", "%d-0" % version)
+ pkgdir = os.path.join(self.trackdir, "pkg", "%s-0" % version)
self.assertEquals(sorted(os.listdir(os.path.join(pkgdir, "src"))),
[name % locals() for name in
- ["testpkg_%(version)d-%(debrevision)s.diff.gz",
- "testpkg_%(version)d-%(debrevision)s.dsc",
- "testpkg_%(version)d.orig.tar.gz"]])
+ ["testpkg_%(version)s-%(debrevision)s.diff.gz",
+ "testpkg_%(version)s-%(debrevision)s.dsc",
+ "testpkg_%(version)s.orig.tar.gz"]])
self.assertEquals(sorted(os.listdir(os.path.join(pkgdir, "binary"))),
[name % locals() for name in
- ["testpkg_%(version)d-%(debrevision)s_all.deb",
- "testpkg_%(version)d-%(debrevision)s_i386.changes"]])
+ ["testpkg_%(version)s-%(debrevision)s_all.deb",
+ "testpkg_%(version)s-%(debrevision)s_i386.changes"]])
class TestPackager(PackagerTest):
@@ -151,7 +151,7 @@
self.runtest("treepkg1")
def test_custom_pkg_revision_template(self):
- self.runtest("kk1.2", pkg_revision_template="kk%(pkg_revision)d.2")
+ self.runtest("kk1.2", pkg_revision_template="kk%(pkg_revision)s.2")
class TestPackagerWithMultipleRevisions(PackagerTest):
@@ -168,7 +168,7 @@
def test_packaging_specific_revision(self):
# Package the newest revision and then package an older one.
self.runtest("treepkg1")
- self.runtest("treepkg1", group_args=dict(revision=3))
+ self.runtest("treepkg1", group_args=dict(revision='3'))
class StoppingPackager(treepkg.packager.RevisionPackager):
Modified: branches/scratchbox/treepkg/subversion.py
===================================================================
--- branches/scratchbox/treepkg/subversion.py 2010-04-08 10:18:49 UTC (rev 262)
+++ branches/scratchbox/treepkg/subversion.py 2010-04-13 08:52:50 UTC (rev 263)
@@ -78,7 +78,7 @@
if str_rev is None:
raise SubversionError("Cannot determine last changed revision for %r"
% svn_working_copy)
- return int(str_rev)
+ return str_rev
def svn_url(url_or_working_copy):
"""Returns the URL used for the working copy in svn_working_copy"""
More information about the Treepkg-commits
mailing list