Switch all headers to python3

[fdroidserver.git] / fdroidserver / server.py

diff --git a/fdroidserver/server.py b/fdroidserver/server.py
index 114e8a801076384187ac0f4eabd37a70c26142d2..80fc24f01854a36df9ddd3e02807594716a0c936 100644 (file)
--- a/fdroidserver/server.py
+++ b/fdroidserver/server.py
@@ -1,5 +1,4 @@
-#!/usr/bin/env python2
-# -*- coding: utf-8 -*-
+#!/usr/bin/env python3
 #
 # server.py - part of the FDroid server tools
 # Copyright (C) 2010-15, Ciaran Gultnieks, ciaran@ciarang.com
@@ -196,6 +195,7 @@ def main():
 
     # Parse command line...
     parser = ArgumentParser()
+    common.setup_global_opts(parser)
     parser.add_argument("command", help="command to execute, either 'init' or 'update'")
     parser.add_argument("-i", "--identity-file", default=None,
                         help="Specify an identity file to provide to SSH for rsyncing")
@@ -203,10 +203,6 @@ def main():
                         help="Specify a local folder to sync the repo to")
     parser.add_argument("--sync-from-local-copy-dir", action="store_true", default=False,
                         help="Before uploading to servers, sync from local copy dir")
-    parser.add_argument("-v", "--verbose", action="store_true", default=False,
-                        help="Spew out even more information than normal")
-    parser.add_argument("-q", "--quiet", action="store_true", default=False,
-                        help="Restrict output to warnings and errors")
     parser.add_argument("--no-checksum", action="store_true", default=False,
                         help="Don't use rsync checksums")
     options = parser.parse_args()