From aef5c6c21b5a161b83acacd7bd3847f4662958fe Mon Sep 17 00:00:00 2001 From: o355 Date: Sat, 29 Apr 2017 23:55:18 -0400 Subject: [PATCH] Had to make some minor 0.5.2 changes... --- CHANGELOG.md | 4 ++-- pyweather.py | 5 +---- updater.py | 4 ++-- updater/versioncheck.json | 2 +- 4 files changed, 6 insertions(+), 9 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 67c2dcc..169c5e9 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -18,7 +18,7 @@ Quick note: I generally use the changelog (thanks Eclipse for supporting MD file ### version 0.5.3 beta - Release not occurring. * Rewrites multiline prints in keybackup.py/updater.py (thanks to @gsilvapt for the PR/notifing me of the issue, and @Rhomboid on /r/learnpython for a good solution) - Scrapped. Will be implemented in 0.9 beta. -## version 0.5.2 beta - Released on 4/29/2017 +## version 0.5.2 beta - Released on 4/30/2017 **NEW FEATURES/REMOVALS** * Adds the raw traceback output in keybackup.py * Changes the error message when the config file fails to load (the potential for the file to not get loaded) @@ -38,7 +38,7 @@ Quick note: I generally use the changelog (thanks Eclipse for supporting MD file **BUG FIXES** * Fixed a bug in which if tracebacks were enabled in the updater, the tracebacks wouldn't print properly, as such, producing a traceback. Huh. -* Fixing a bug in all scripts that involved issuing HTTP requests. This is now improved with user strings, and should prevent random 400 errors. +* Fixed a bug in all scripts that involved issuing HTTP requests. This is now improved with user strings, and should prevent random 400 errors. ## version 0.5.1 beta - Released on 4/17/2017 **NEW FEATURES/REMOVALS:** diff --git a/pyweather.py b/pyweather.py index 80a118b..e31a72c 100644 --- a/pyweather.py +++ b/pyweather.py @@ -1390,11 +1390,8 @@ def printException_loggerwarn(): if confirmUpdateWithGit == "yes": print("Now updating with Git.") try: - # We check out to master since doing git pull in a - # detached head state is apparently impossible! - subprocess.call(["git checkout master"], shell=True) subprocess.call(["git stash"], shell=True) - subprocess.call(["git pull"], shell=True) + subprocess.call(["git fetch"], shell=True) subprocess.call(["git stash"], shell=True) subprocess.call(["git checkout %s" % version_latestReleaseTag], shell=True) diff --git a/updater.py b/updater.py index db799c1..0653ef9 100644 --- a/updater.py +++ b/updater.py @@ -154,9 +154,9 @@ def printException_loggerwarn(): if confirmUpdateWithGit == "yes": print("Now updating with Git.") try: - subprocess.call(["git checkout master"], shell=True) + # Doesn't hurt to stash twice. subprocess.call(["git stash"], shell=True) - subprocess.call(["git pull"], shell=True) + subprocess.call(["git fetch"], shell=True) subprocess.call(["git stash"], shell=True) subprocess.call(["git checkout %s" % version_latestReleaseTag], shell=True) diff --git a/updater/versioncheck.json b/updater/versioncheck.json index 0b1fcef..da7be54 100644 --- a/updater/versioncheck.json +++ b/updater/versioncheck.json @@ -6,6 +6,6 @@ "latestversiontag": "0.5.2-beta", "latesturl": "https://github.com/o355/pyweather/releases/download/0.5.2-beta/pyweather-0.5.2beta.zip", "latestfilename": "pyweather-0.5.2beta.zip", - "releasedate": "4/29/2017" + "releasedate": "4/30/2017" } }