diff --git a/overviewer_core/util.py b/overviewer_core/util.py index 826dcd9..a11cb26 100644 --- a/overviewer_core/util.py +++ b/overviewer_core/util.py @@ -62,7 +62,7 @@ def findGitHash(): def findGitVersion(): try: - p = Popen(['git', 'describe', '--tags'], stdout=PIPE, stderr=PIPE, shell=True) + p = Popen('git describe --tags', stdout=PIPE, stderr=PIPE, shell=True) p.stderr.close() line = p.stdout.readlines()[0] if line.startswith('release-'): diff --git a/overviewer_core/world.py b/overviewer_core/world.py index 3bb34ec..1f8238e 100644 --- a/overviewer_core/world.py +++ b/overviewer_core/world.py @@ -79,7 +79,10 @@ class World(object): # if not mcregion, error out early data = nbt.load(os.path.join(self.worlddir, "level.dat"))[1]['Data'] if not ('version' in data and data['version'] == 19132): - logging.error("Sorry, This version of Minecraft-Overviewer only works with the old McRegion format. You will need to upgrade to render Minecraft 1.2 ('Anvil') worlds") + logging.error("Sorry, This version of Minecraft-Overviewer only works with McRegion format") + if ('version' in data and data['version'] == 19133): + logging.error("You will need to upgrade to render Minecraft 1.2 ('Anvil') worlds") + logging.error("Please see http://overviewer.org/blog/2012/03/01/anvil-support/") sys.exit(1) if 'LevelName' in data: # level.dat should have the LevelName attribute so we'll use that