Renamed munkicommon.version() to munkicommon.get_version() to prevent name conflict with the version library from the distutil module.

git-svn-id: http://munki.googlecode.com/svn/trunk@305 a4e17f2e-e282-11dd-95e1-755cbddbdd66
This commit is contained in:
Greg Neagle
2009-11-02 23:10:12 +00:00
parent 0e4bc73db9
commit 6524802657
2 changed files with 2 additions and 2 deletions
+1 -1
View File
@@ -196,7 +196,7 @@ def main():
options, arguments = p.parse_args()
if options.version:
print munkicommon.version()
print munkicommon.get_version()
exit(0)
if options.auto:
+1 -1
View File
@@ -38,7 +38,7 @@ from Foundation import NSDictionary, NSDate
import munkistatus
import FoundationPlist
def version():
def get_version():
'''Returns version of munkitools'''
return "0.4.5"