From 018e7ac69d572f1de2fc0e9aac094a5aca01d340 Mon Sep 17 00:00:00 2001 From: Greg Brockman Date: Tue, 6 Jul 2010 00:28:25 -0400 Subject: [PATCH] Minor touchups to invirtibuilder svn path=/trunk/packages/invirt-dev/; revision=3043 --- invirtibuilder | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/invirtibuilder b/invirtibuilder index a42ce55..ca12398 100755 --- a/invirtibuilder +++ b/invirtibuilder @@ -129,7 +129,7 @@ def sbuildAll(package, ref, workdir): sbuild(package, ref, 'i386', workdir) -def tagSubmodule(pocket, package, principal, version, env): +def tagSubmodule(pocket, package, commit, principal, version, env): """Tag a new version of a submodule. If this pocket does not allow_backtracking, then this will create @@ -153,15 +153,15 @@ def tagSubmodule(pocket, package, principal, version, env): c.captureOutput( ['git', 'tag', '-m', tag_msg, commit], - stdout=None, - env=env) + env=env, + cwd=b.getRepo(package)) -def updateSubmoduleBranch(pocket, package, ref): +def updateSubmoduleBranch(pocket, package, commit): """Update the appropriately named branch in the submodule.""" branch = b.pocketToGit(pocket) c.captureOutput( - ['git', 'update-ref', 'refs/heads/%s' % branch, ref], cwd=b.getRepo(package)) + ['git', 'update-ref', 'refs/heads/%s' % branch, commit], cwd=b.getRepo(package)) def uploadBuild(pocket, workdir): -- 1.7.9.5