Skip to content

Commit

Permalink
Had to make some minor 0.5.2 changes...
Browse files Browse the repository at this point in the history
  • Loading branch information
o355 committed Apr 30, 2017
1 parent d5aaeb5 commit aef5c6c
Show file tree
Hide file tree
Showing 4 changed files with 6 additions and 9 deletions.
4 changes: 2 additions & 2 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand All @@ -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:**
Expand Down
5 changes: 1 addition & 4 deletions pyweather.py
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
4 changes: 2 additions & 2 deletions updater.py
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion updater/versioncheck.json
Original file line number Diff line number Diff line change
Expand Up @@ -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"
}
}

0 comments on commit aef5c6c

Please sign in to comment.