Add 'overwrite' command line option

If the overwrite command line options is used, existing package files
can be overwritten during upload. By default existing package files will
not be overwritten.

README.rst

@@ -102,6 +102,9 @@ pypi-server -h will print a detailed usage message::
     -r PACKAGES_DIRECTORY, --root PACKAGES_DIRECTORY
       [deprecated] serve packages from PACKAGES_DIRECTORY
 
+    -o, --overwrite
+      allow overwriting existing package files
+      
   pypi-server -h
   pypi-server --help
     show this help message
@@ -450,6 +453,11 @@ EggBasket (http://pypi.python.org/pypi/EggBasket)
 
 Changelog
 =========
+unreleased
+----------
+- add 'overwrite' option to allow overwriting existing package
+  files (default: false)
+
 1.1.0 (2013-02-14)
 ------------------
 - implement multi-root support (one can now specify multiple package

pypiserver/__init__.py

@@ -5,7 +5,8 @@ version = __version__ = "1.1.0"
 def app(root=None,
         redirect_to_fallback=True,
         fallback_url=None,
-        password_file=None):
+        password_file=None,
+        overwrite=False):
     import sys, os
     from pypiserver import core
     sys.modules.pop("pypiserver._app", None)
@@ -21,7 +22,7 @@ def app(root=None,
         fallback_url = "http://pypi.python.org/simple"
 
     _app.configure(root=root, redirect_to_fallback=redirect_to_fallback, fallback_url=fallback_url,
-                   password_file=password_file)
+                   password_file=password_file, overwrite=overwrite)
     _app.app.module = _app
 
     bottle.debug(True)

pypiserver/_app.py

@@ -12,7 +12,7 @@ else:
 
 from bottle import static_file, redirect, request, HTTPError, Bottle
 from pypiserver import __version__
-from pypiserver.core import listdir, find_packages, store, get_prefixes
+from pypiserver.core import listdir, find_packages, store, get_prefixes, exists
 
 packages = None
 
@@ -35,7 +35,8 @@ def validate_user(username, password):
 def configure(root=None,
               redirect_to_fallback=True,
               fallback_url=None,
-              password_file=None):
+              password_file=None,
+              overwrite=False):
     global packages
 
     if root is None:
@@ -65,6 +66,7 @@ def configure(root=None,
     if password_file:
         from passlib.apache import HtpasswdFile
         config.htpasswdfile = HtpasswdFile(password_file)
+    config.overwrite = overwrite
 
 app = Bottle()
 
@@ -161,9 +163,10 @@ def update():
     if "/" in content.filename:
         raise HTTPError(400, output="bad filename")
 
-    if not store(packages.root, content.filename, content.value):
+    if not config.overwrite and exists(packages.root, content.filename):
         raise HTTPError(409, output="file already exists")
 
+    store(packages.root, content.filename, content.value)
     return ""
 
 

pypiserver/core.py

@@ -115,17 +115,20 @@ def get_prefixes(pkgs):
     return pkgnames
 
 
+def exists(root, filename):
+    assert "/" not in filename
+    dest_fn = os.path.join(root, filename)
+    return os.path.exists(dest_fn)
+
+
 def store(root, filename, data):
     assert "/" not in filename
     dest_fn = os.path.join(root, filename)
-    if not os.path.exists(dest_fn):
     dest_fh = open(dest_fn, "wb")
     dest_fh.write(data)
     dest_fh.close()
     return True
 
-    return False
-
 
 def usage():
     sys.stdout.write("""pypi-server [OPTIONS] [PACKAGES_DIRECTORY...]
@@ -165,6 +168,9 @@ pypi-server understands the following options:
   -r PACKAGES_DIRECTORY, --root PACKAGES_DIRECTORY
     [deprecated] serve packages from PACKAGES_DIRECTORY
 
+  -o, --overwrite
+    allow overwriting existing package files
+
 pypi-server -h
 pypi-server --help
   show this help message
@@ -207,13 +213,14 @@ def main(argv=None):
     redirect_to_fallback = True
     fallback_url = "http://pypi.python.org/simple"
     password_file = None
+    overwrite = False
 
     update_dry_run = True
     update_directory = None
     update_stable_only = True
 
     try:
-        opts, roots = getopt.getopt(argv[1:], "i:p:r:d:P:Uuxh", [
+        opts, roots = getopt.getopt(argv[1:], "i:p:r:d:P:Uuxoh", [
             "interface=",
             "passwords=",
             "port=",
@@ -221,6 +228,7 @@ def main(argv=None):
             "server=",
             "fallback-url=",
             "disable-fallback",
+            "overwrite",
             "version",
             "help"
         ])
@@ -257,6 +265,8 @@ def main(argv=None):
             update_directory = v
         elif k in ("-P", "--passwords"):
             password_file = v
+        elif k in ("-o", "--overwrite"):
+            overwrite = True
         elif k in ("-h", "--help"):
             usage()
             sys.exit(0)
@@ -277,7 +287,8 @@ def main(argv=None):
         root=roots,
         redirect_to_fallback=redirect_to_fallback,
         password_file=password_file,
-        fallback_url=fallback_url
+        fallback_url=fallback_url,
+        overwrite=overwrite,
     )
     server = server or "auto"
     sys.stdout.write("This is pypiserver %s serving %r on http://%s:%s\n\n" % (__version__, ", ".join(roots), host, port))