Removed the old .cvsignore from khashmir.

[quix0rs-apt-p2p.git] / apt-dht.py

diff --git a/apt-dht.py b/apt-dht.py
index 30b6a93a88d082230e90fbf38467e4dc94dd69f6..73c3ddef66f9bb96381782abcf1416fcd581a094 100644 (file)
--- a/apt-dht.py
+++ b/apt-dht.py
@@ -16,8 +16,8 @@ from twisted.internet import reactor
 from twisted.python import usage, log
 from twisted.web2 import channel
 
-from apt_dht import AptDHT
-from apt_dht_conf import config
+from apt_dht.apt_dht import AptDHT
+from apt_dht.apt_dht_conf import config, version
 
 config_file = []
 
@@ -28,11 +28,11 @@ if __name__ == '__main__':
             ['help', 'h'],
             ]
         optParameters = [
-            ['config-file', 'c', None, "Configuration file"],
+            ['config-file', 'c', [], "Configuration file"],
             ]
         longdesc="apt-dht is a peer-to-peer downloader for apt users"
         def opt_version(self):
-            print "apt-dht 1.9.x"
+            print "apt-dht %s" % version.short()
             sys.exit(0)
 
     opts = AptDHTOptions()