[Pkg-owncloud-commits] [python-owncloud] 71/96: Revert "whatever"

[Sandro Knauß]

This is an automated email from the git hooks/post-receive script.

hefee-guest pushed a commit to branch master
in repository python-owncloud.

commit b8582bce785693276a258ec115bd1aa75673af8c
Author: Craig <csawyer at yumaed.org>
Date:   Wed Apr 3 12:56:39 2013 -0700

    Revert "whatever"
    
    This reverts commit 2d562d5ee11261c83d0079b76a89f2658ff4bd4e.
---
 csync/version.dat |    2 +-
 csync/version.py  |    9 ++++++---
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/csync/devel b/csync/devel
new file mode 100644
index 0000000..e69de29
diff --git a/csync/version.dat b/csync/version.dat
index 9e8455a..4ed816b 100644
--- a/csync/version.dat
+++ b/csync/version.dat
@@ -1 +1 @@
-{"head": "5e74a46096b4b10e8da324680f5e283cde0f6b25", "float": 0.2, "string": "0.2"}
\ No newline at end of file
+{"head": "5c32717e4b3770da29c4ba61004be2e0239c2616", "float": 0.2, "string": "0.2"}
\ No newline at end of file
diff --git a/csync/version.py b/csync/version.py
index ba018bb..d21a980 100644
--- a/csync/version.py
+++ b/csync/version.py
@@ -88,7 +88,7 @@ class gitVersion(ver):
 		"""if git is around, return the current version and save it.
 		otherwise return the saved copy, or 00 if not already saved.
 		"""
-		gitdir = os.path.join(os.path.dirname(os.path.abspath(self.verfile)),'..','.git')
+		gitdir = os.path.join(os.path.dirname(os.path.abspath(self.verfile)),'.git')
 		if not os.path.exists(gitdir):
 			return '00'
 		cmd = 'git rev-parse --verify HEAD'.split()
@@ -114,12 +114,15 @@ class gitVersion(ver):
 		return self.getHeadVersion()
 
 BASE_DIR = os.path.abspath(os.path.dirname(__file__))
-version = gitVersion(os.path.join(BASE_DIR, 'version.dat'))
+if os.path.exists(os.path.join(BASE_DIR, 'devel')):
+    version = gitVersion(os.path.join(BASE_DIR, 'version.dat'))
+else:
+    version = ver(os.path.join(BASE_DIR, 'version.dat'))
 
 
 if __name__ == '__main__':
 	print 'Testing version.'
-	v = version
+	v = hgVersion()
 	print 'dict:', v.version
 	print 'string:', v.asString
 	print 'float:', v.asFloat

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-owncloud/python-owncloud.git