Permalink
Browse files

fix -f option of couchapp vendor (to force instllation)

  • Loading branch information...
benoitc committed Feb 21, 2010
1 parent 31114f7 commit 87233994459f6a6f286a318fd5f7838ff9be1ed8
Showing with 10 additions and 16 deletions.
  1. +3 −3 couchapp/couchdbresource.py
  2. +7 −11 couchapp/vendor.py
  3. +0 −2 setup.py
@@ -39,8 +39,9 @@
class CouchDBResource(object):
- def __init__(self, ui, url="http://127.0.0.1:5984", headers=None, timeout=DEFAULT_TIMEOUT,
- max_connections=MAX_CONNECTIONS, key_file=None, cert_file=None):
+ def __init__(self, ui, url="http://127.0.0.1:5984", headers=None,
+ timeout=DEFAULT_TIMEOUT, max_connections=MAX_CONNECTIONS,
+ key_file=None, cert_file=None):
headers = headers or {}
uri = url_parser(url)
if uri.scheme != "http" and uri.scheme != "https":
@@ -178,7 +179,6 @@ def request(self, method, path=None, payload=None, headers=None, **params):
headers = headers or {}
headers.update(self._headers.copy())
-
size = headers.get('Content-Length', None)
if payload:
View
@@ -126,17 +126,13 @@ def install(self, appdir, uri, *args, **opts):
if os.path.isdir(dest):
if should_force:
self.ui.deltree(dest)
- shutil.copytree(path, dest)
- self.ui.write_json(metaf, meta)
- if self.ui.verbose >= 1:
- self.ui.logger.info("%s installed in vendors")
- self.ui.logger.error("vendor: %s already installed" % name)
- continue
- else:
- shutil.copytree(path, dest)
- self.ui.write_json(metaf, meta)
- if self.ui.verbose >= 1:
- self.ui.logger.info("%s installed in vendors" % name)
+ else:
+ self.ui.logger.error("vendor: %s already installed" % name)
+ continue
+ shutil.copytree(path, dest)
+ self.ui.write_json(metaf, meta)
+ if self.ui.verbose >= 1:
+ self.ui.logger.info("%s installed in vendors" % name)
self.ui.deltree(temppath)
return 0
View
@@ -23,8 +23,6 @@
[os.path.join(dir, file_) for file_ in files]))
-
-
if os.name == "nt":
# py2exe needs to be installed to work
try:

0 comments on commit 8723399

Please sign in to comment.