Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Merge branch 'master' of github.com:bretth/woven

  • Loading branch information...
commit 50385b92152ef4f551e5d36b9e1843d1723c1f02 2 parents 6e13012 + de427aa
@bretth authored
Showing with 4 additions and 6 deletions.
  1. +3 −5 bin/woven-admin.py
  2. +1 −1  setup.py
View
8 bin/woven-admin.py
@@ -178,12 +178,13 @@ def start_distribution(project_name, template_dir, dist, noadmin):
sys.exit(1)
local_working_dir = os.path.split(env.setup_path)[0]
os.chdir(local_working_dir)
-
+
+ woven_admin = sys.argv[0]
setup = run_setup('setup.py',stop_after="init")
settings_mod = '.'.join([setup.packages[0],'settings'])
os.environ['DJANGO_SETTINGS_MODULE'] = settings_mod
sys.argv.remove('setup.py')
-
+ sys.argv.insert(0, woven_admin)
#be path friendly like manage.py
sys.path.append(os.getcwd())
@@ -234,8 +235,5 @@ def start_distribution(project_name, template_dir, dist, noadmin):
else:
#switch back to the original directory just in case some command needs it
os.chdir(orig_cwd)
- #inject woven-admin.py into the args
- if not 'woven-admin.py' in sys.argv[0]:
- sys.argv.insert(0,'woven-admin.py')
execute_from_command_line()
View
2  setup.py
@@ -31,5 +31,5 @@
'Topic :: Software Development :: Libraries :: Python Modules',
'Topic :: Utilities'],
long_description="See http://packages.python.org/woven/ for documentation",
- install_requires=['Fabric','Paramiko','Django'],
+ install_requires=['Fabric','Paramiko'],
)
Please sign in to comment.
Something went wrong with that request. Please try again.