Skip to content

Commit

Permalink
Change original git patch, document changes
Browse files Browse the repository at this point in the history
  • Loading branch information
TheLastProject committed Apr 1, 2017
1 parent 1505f44 commit 4d4e2cb
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 3 deletions.
2 changes: 2 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,8 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
## [Unreleased]
### Fixed
- Clicking the tray icon no longer toggles visibility on macOS
- XDG_CONFIG_HOME is now correctly used when available
- The environment is no longer cleared when doing the initial git clone (security: the old behaviour would cause a proxy defined in the environment to be ignored)

## [0.6] - 2017-02-27
### Added
Expand Down
8 changes: 5 additions & 3 deletions pext/__main__.py
Original file line number Diff line number Diff line change
Expand Up @@ -97,6 +97,7 @@ def __init__(self) -> None:
config_home = os.environ['XDG_CONFIG_HOME']
except:
config_home = os.path.expanduser('~/.config/')

self.config = {'config_path': os.path.join(config_home, 'pext/')}

# Overwrite with user settings if exists
Expand Down Expand Up @@ -711,9 +712,10 @@ def install_module(self, url: str, verbose=False, interactive=True) -> bool:
return_code = Popen(['git', 'clone', url, dir_name],
cwd=self.module_dir,
env=git_env if not interactive else None).wait()
except FileNotFoundError:
self._log_error('Failed to launch git')
return_code = 1
except Exception as e:
self._log_error('Failed to download {}: {}'.format(module_name, e))

return False

if return_code != 0:
if verbose:
Expand Down

0 comments on commit 4d4e2cb

Please sign in to comment.