Skip to content

Commit

Permalink
Merge branch 'master' of github.com:nephila/djangocms-installer
Browse files Browse the repository at this point in the history
  • Loading branch information
yakky committed Nov 30, 2014
2 parents af32748 + 010aa14 commit dd6a4c8
Show file tree
Hide file tree
Showing 4 changed files with 6 additions and 5 deletions.
2 changes: 1 addition & 1 deletion djangocms_installer/__main__.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,4 +5,4 @@
if __name__ == '__main__':
status = execute()
if status:
sys.exit(status)
sys.exit(status)
5 changes: 3 additions & 2 deletions djangocms_installer/config/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -91,8 +91,9 @@ def parse(args):

# First of all, check if the project name is valid
if not validate_project(args.project_name):
sys.stderr.write("Project name '%s' is not a valid app name. Please use only numbers, letters and underscores.\n"
% args.project_name)
sys.stderr.write("Project name '%s' is not a valid app name. "
"Please use only numbers, letters and underscores.\n"
% args.project_name)
sys.exit(3)

for item in data.CONFIGURABLE_OPTIONS:
Expand Down
2 changes: 1 addition & 1 deletion djangocms_installer/config/internal.py
Original file line number Diff line number Diff line change
Expand Up @@ -37,4 +37,4 @@ def validate_project(project_name):
__import__(project_name)
return None
except ImportError:
return project_name
return project_name
2 changes: 1 addition & 1 deletion djangocms_installer/install/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -62,4 +62,4 @@ def requirements(requirements, is_file=False):
exit_status = pip.main(args)
if exit_status != SUCCESS:
raise InstallationError("Error while installing requirements. Check pip log file for error details.")
return True
return True

0 comments on commit dd6a4c8

Please sign in to comment.