Commit 90010afa authored by Ayush Tiwari's avatar Ayush Tiwari

DEBUG 1

parent 5656b48c
...@@ -379,7 +379,7 @@ revision = %s ...@@ -379,7 +379,7 @@ revision = %s
changes) changes)
""" """
self.setUpParentRepository() self.setUpParentRepository()
print 'STATE 1'
# Clone repositories in status M1 # Clone repositories in status M1
write(sample_buildout, 'buildout.cfg', write(sample_buildout, 'buildout.cfg',
""" """
...@@ -391,7 +391,7 @@ recipe = slapos.recipe.build:gitclone ...@@ -391,7 +391,7 @@ recipe = slapos.recipe.build:gitclone
repository = %s repository = %s
""" % self.project_dir) """ % self.project_dir)
check_call([buildout]) check_call([buildout])
print 'STATE 2'
initial_commit_parent_repo = self.getRepositoryHeadCommit(self.project_dir) initial_commit_parent_repo = self.getRepositoryHeadCommit(self.project_dir)
# Check if the parent repo is present # Check if the parent repo is present
main_repo_path = os.path.join(sample_buildout, 'parts', 'git-clone') main_repo_path = os.path.join(sample_buildout, 'parts', 'git-clone')
...@@ -404,7 +404,8 @@ repository = %s ...@@ -404,7 +404,8 @@ repository = %s
self.setUpSubmoduleRepository() self.setUpSubmoduleRepository()
# Attach the submodule repository to the parent repo on remote # Attach the submodule repository to the parent repo on remote
self.attachSubmoduleToParent() self.attachSubmoduleToParent()
print 'STATE 3'
print '%s' % self.project_dir
# Trigger update using buildout # Trigger update using buildout
check_call([buildout]) check_call([buildout])
......
...@@ -173,7 +173,7 @@ class Recipe(object): ...@@ -173,7 +173,7 @@ class Recipe(object):
try: try:
check_call(command, cwd=self.location) check_call(command, cwd=self.location)
except CalledProcessError, e: except CalledProcessError, e:
print "Git Reset stdout output:\n", e.returncode print "Git Reset stdout output:\n", e.output
raise raise
def gitRemoveSubmodule(self, submodule_path=None): def gitRemoveSubmodule(self, submodule_path=None):
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment