Bug fixes.

diff --git a/cdist/cmd_release.py b/cdist/cmd_release.py
index 6400121ce41a1e6e72da071e8ffc25c53d193dcd..fc6f4309439c88cf526e5e8a533346607902405f 100644 (file)
--- a/cdist/cmd_release.py
+++ b/cdist/cmd_release.py
@@ -1,3 +1,25 @@
+#
+#    Copyright (C) 2012-2015 Carl Hetherington <cth@carlh.net>
+#
+#    This program is free software; you can redistribute it and/or modify
+#    it under the terms of the GNU General Public License as published by
+#    the Free Software Foundation; either version 2 of the License, or
+#    (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU General Public License for more details.
+
+#    You should have received a copy of the GNU General Public License
+#    along with this program; if not, write to the Free Software
+#    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+
+from target import SourceTarget
+import globals
+from util import *
+from tree_directory import TreeDirectory
+
 class CmdRelease(object):
     def __init__(self):
         self.name = 'release'
@@ -17,17 +39,18 @@ class CmdRelease(object):
         else:
             version.bump_micro()
 
-        set_version_in_wscript(version)
-        append_version_to_changelog(version)
-        append_version_to_debian_changelog(version)
+        with TreeDirectory(tree):
+            set_version_in_wscript(version)
+            append_version_to_changelog(version)
+            append_version_to_debian_changelog(version)
 
-        command('git commit -a -m "Bump version"')
-        command('git tag -m "v%s" v%s' % (version, version))
+            command('git commit -a -m "Bump version"')
+            command('git tag -m "v%s" v%s' % (version, version))
 
-        version.to_devel()
-        set_version_in_wscript(version)
-        command('git commit -a -m "Bump version"')
-        command('git push')
-        command('git push --tags')
+            version.to_devel()
+            set_version_in_wscript(version)
+            command('git commit -a -m "Bump version"')
+            command('git push')
+            command('git push --tags')
 
         target.cleanup()