r159 - in /debtorrent/trunk: DebTorrent/download_bt1.py btdownloadheadless.py btlaunchmany.py debtorrent.py

[camrdale-guest at users.alioth.debian.org]

Author: camrdale-guest
Date: Fri Jul 13 20:39:32 2007
New Revision: 159

URL: http://svn.debian.org/wsvn/debtorrent/?sc=1&rev=159
Log:
Move the responsefile and url command-line parameters to btdownloadheadless.

Modified:
    debtorrent/trunk/DebTorrent/download_bt1.py
    debtorrent/trunk/btdownloadheadless.py
    debtorrent/trunk/btlaunchmany.py
    debtorrent/trunk/debtorrent.py

Modified: debtorrent/trunk/DebTorrent/download_bt1.py
URL: http://svn.debian.org/wsvn/debtorrent/debtorrent/trunk/DebTorrent/download_bt1.py?rev=159&op=diff
==============================================================================
--- debtorrent/trunk/DebTorrent/download_bt1.py (original)
+++ debtorrent/trunk/DebTorrent/download_bt1.py Fri Jul 13 20:39:32 2007
@@ -62,10 +62,6 @@
     ('configfile', '', 'the configuration file to use, if not specified then ' +
         'a file in the .DebTorrent directory in the user\'s home directory '+
         'will be used'),
-    ('responsefile', '',
-        'file the server response was stored in, alternative to url'),
-    ('url', '',
-        'url to get file from, alternative to responsefile'),
     ('priority', '',
         'a list of file priorities separated by commas, must be one per file, ' +
         '0 = highest, 1 = normal, 2 = lowest, -1 = download disabled'),

Modified: debtorrent/trunk/btdownloadheadless.py
URL: http://svn.debian.org/wsvn/debtorrent/debtorrent/trunk/btdownloadheadless.py?rev=159&op=diff
==============================================================================
--- debtorrent/trunk/btdownloadheadless.py (original)
+++ debtorrent/trunk/btdownloadheadless.py Fri Jul 13 20:39:32 2007
@@ -252,13 +252,19 @@
     h = HeadlessDisplayer()
     while 1:
         configdir = ConfigDir('downloadheadless')
-        defaults.extend([('save_options',0,
+        defaults.extend([
+            ('responsefile', '',
+                'file the server response was stored in, alternative to url'),
+            ('url', '',
+                'url to get file from, alternative to responsefile'),
+            ('save_options',0,
              "whether to save the current options as the new default configuration " +
              "(only for btdownloadheadless.py)"),
-             ('separate_all',0, 'whether to separate the architecture:all packages, ' +
+            ('separate_all',0, 'whether to separate the architecture:all packages, ' +
               "0 = don't separate, 1 = separate and run architecture:all, " +
-              "2 = separate and run all architectures but all")])
-        defaultsToIgnore = ['responsefile', 'url', 'priority', 'save_options']
+              "2 = separate and run all architectures but all"),
+            ])
+        defaultsToIgnore = ['configfile', 'priority', 'responsefile', 'url', 'save_options']
         configdir.setDefaults(defaults,defaultsToIgnore)
         configdefaults = configdir.loadConfig(params)
         try:

Modified: debtorrent/trunk/btlaunchmany.py
URL: http://svn.debian.org/wsvn/debtorrent/debtorrent/trunk/btlaunchmany.py?rev=159&op=diff
==============================================================================
--- debtorrent/trunk/btlaunchmany.py (original)
+++ debtorrent/trunk/btlaunchmany.py Fri Jul 13 20:39:32 2007
@@ -148,7 +148,7 @@
     configdefaults = {}
     try:
         configdir = ConfigDir('launchmany')
-        defaultsToIgnore = ['responsefile', 'url', 'priority']
+        defaultsToIgnore = ['configfile', 'priority']
         configdir.setDefaults(defaults,defaultsToIgnore)
         configdefaults = configdir.loadConfig(params)
         defaults.append(('save_options',0,

Modified: debtorrent/trunk/debtorrent.py
URL: http://svn.debian.org/wsvn/debtorrent/debtorrent/trunk/debtorrent.py?rev=159&op=diff
==============================================================================
--- debtorrent/trunk/debtorrent.py (original)
+++ debtorrent/trunk/debtorrent.py Fri Jul 13 20:39:32 2007
@@ -137,7 +137,7 @@
     configdefaults = {}
     try:
         configdir = ConfigDir('debtorrent')
-        defaultsToIgnore = ['responsefile', 'url', 'priority']
+        defaultsToIgnore = ['configfile', 'priority']
         configdir.setDefaults(defaults,defaultsToIgnore)
         configdefaults = configdir.loadConfig(params)
         defaults.append(('save_options',0,