Permalink
Browse files

More fixes

  • Loading branch information...
1 parent 78b847e commit f27704f39d86bc510749ac318a05a178d1c855dc @BonsaiDen committed Feb 13, 2011
Showing with 8 additions and 5 deletions.
  1. +8 −5 make
View
13 make
@@ -96,18 +96,21 @@ def merge_pages():
print 'Files copied sucessfully'
print 'Switching to gh-pages...'
- git = subprocess.Popen(['git', 'checkout', 'gh-pages'],
+ git = subprocess.Popen(['git', 'checkout gh-pages'],
stdout=subprocess.PIPE)
- print git.communicate()
status = merge_git()
print 'Returning to master...'
- git = subprocess.Popen(['git', 'checkout', 'master'],
+ git = subprocess.Popen(['git', 'checkout master'],
stdout=subprocess.PIPE)
- print git.communicate()
- return status
+ if git.communicate()[0].strip() == 'Aborting':
+ print 'ERROR: Automatic commit failed. Please commit to gh-pages manually'
+ return 1
+
+ else:
+ return status
else:
print 'ERROR: Failed to remove old build directory'

0 comments on commit f27704f

Please sign in to comment.