[Treepkg-commits] r278 - in branches/scratchbox: test treepkg

[scm-commit@wald.intevation.org]

Author: bricks
Date: 2010-04-15 16:56:21 +0200 (Thu, 15 Apr 2010)
New Revision: 278

Modified:
   branches/scratchbox/test/test_listpackages.py
   branches/scratchbox/test/test_readconfig.py
   branches/scratchbox/treepkg/packager.py
   branches/scratchbox/treepkg/readconfig.py
Log:
merged changes from trunk


Modified: branches/scratchbox/test/test_listpackages.py
===================================================================
--- branches/scratchbox/test/test_listpackages.py	2010-04-15 14:55:57 UTC (rev 277)
+++ branches/scratchbox/test/test_listpackages.py	2010-04-15 14:56:21 UTC (rev 278)
@@ -67,7 +67,7 @@
 builderconfig:
 deb_email: packager at example.com
 deb_fullname: Sample Packager
-pkg_revision_template: treepkg%%%%(pkg_revision)d
+pkg_revision_template: treepkg%%%%(pkg_revision)s
 handle_dependencies: False
 
 [treepkg]

Modified: branches/scratchbox/test/test_readconfig.py
===================================================================
--- branches/scratchbox/test/test_readconfig.py	2010-04-15 14:55:57 UTC (rev 277)
+++ branches/scratchbox/test/test_readconfig.py	2010-04-15 14:56:21 UTC (rev 278)
@@ -28,7 +28,7 @@
 builderconfig: %(pbuilder_dir)s/pbuilderrc
 deb_email: treepkg at example.com
 deb_fullname: TreePKG
-pkg_revision_template: treepkg%%(pkg_revision)d
+pkg_revision_template: treepkg%%(pkg_revision)s
 handle_dependencies: False
 
 [treepkg]
@@ -42,7 +42,7 @@
 packager_class: readconfig_test.%(name)s
 handle_dependencies: True
 signing_key_id: abcd1234
-changelog_msg_template: Update to feature branch r%%(revision)d
+changelog_msg_template: Update to feature branch r%%(revision)s
 version_template: 1.0.svn%%(revision)s
 
 [pkg_extraargs]
@@ -88,11 +88,11 @@
                           [
             dict(name="extraargs",
                  base_dir="/home/builder/mill/tracks/extraargs",
-                 changelog_msg_template="Update to revision %(revision)d",
+                 changelog_msg_template="Update to revision %(revision)s",
                  deb_email="treepkg at example.com",
                  deb_fullname="TreePKG",
                  deb_build_options="parallel=2",
-                 pkg_revision_template="treepkg%(pkg_revision)d",
+                 pkg_revision_template="treepkg%(pkg_revision)s",
                  handle_dependencies=False,
                  packager_class="readconfig_test.extraargs",
                  builderconfig="/home/builder/mill/pbuilder/pbuilderrc",
@@ -114,12 +114,12 @@
             dict(name="simple",
                  base_dir="/home/builder/mill/tracks/simple",
                  changelog_msg_template=("Update to feature branch"
-                                         " r%(revision)d"),
+                                         " r%(revision)s"),
                  deb_email="treepkg at example.com",
                  deb_fullname="TreePKG",
                  deb_build_options="",
                  rules_svn_url="",
-                 pkg_revision_template="treepkg%(pkg_revision)d",
+                 pkg_revision_template="treepkg%(pkg_revision)s",
                  handle_dependencies=True,
                  packager_class="readconfig_test.simple",
                  builderconfig="/home/builder/mill/pbuilder/pbuilderrc",

Modified: branches/scratchbox/treepkg/packager.py
===================================================================
--- branches/scratchbox/treepkg/packager.py	2010-04-15 14:55:57 UTC (rev 277)
+++ branches/scratchbox/treepkg/packager.py	2010-04-15 14:56:21 UTC (rev 278)
@@ -351,7 +351,7 @@
     def __init__(self, name, base_dir, root_cmd, builderconfig, deb_email,
                  deb_fullname, svn_url="", packager_class="treepkg.packager",
                  version_template="%(revision)s",
-                 pkg_revision_template="treepkg%(pkg_revision)d",
+                 pkg_revision_template="treepkg%(pkg_revision)s",
                  handle_dependencies=False, signing_key_id="", do_build=True,
                  rules_svn_url=None, deb_build_options="", pkg_basename="",
                  changelog_msg_template="Update to r%(revision)s",

Modified: branches/scratchbox/treepkg/readconfig.py
===================================================================
--- branches/scratchbox/treepkg/readconfig.py	2010-04-15 14:55:57 UTC (rev 277)
+++ branches/scratchbox/treepkg/readconfig.py	2010-04-15 14:56:21 UTC (rev 278)
@@ -75,7 +75,7 @@
     "pkg_revision_template", ("pkg_basename", str, ""),
     ("handle_dependencies", convert_bool),
     ("signing_key_id", str, ""),
-    ("changelog_msg_template", str, "Update to revision %(revision)d"),
+    ("changelog_msg_template", str, "Update to revision %(revision)s"),
     ("git_branch", str,""),
     ("git_url", str,"")
     ]