r172 - in /debtorrent/trunk: DebTorrent/ConfigDir.py DebTorrent/download_bt1.py config.debtorrent-client.ini debtorrent-client.conf

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

Author: camrdale-guest
Date: Mon Jul 16 05:48:06 2007
New Revision: 172

URL: http://svn.debian.org/wsvn/debtorrent/?sc=1&rev=172
Log:
Rename the config files.
Don't load the /etc config file when one is specified on the command line.

Added:
    debtorrent/trunk/debtorrent-client.conf
      - copied, changed from r170, debtorrent/trunk/config.debtorrent-client.ini
Removed:
    debtorrent/trunk/config.debtorrent-client.ini
Modified:
    debtorrent/trunk/DebTorrent/ConfigDir.py
    debtorrent/trunk/DebTorrent/download_bt1.py

Modified: debtorrent/trunk/DebTorrent/ConfigDir.py
URL: http://svn.debian.org/wsvn/debtorrent/debtorrent/trunk/DebTorrent/ConfigDir.py?rev=172&op=diff
==============================================================================
--- debtorrent/trunk/DebTorrent/ConfigDir.py (original)
+++ debtorrent/trunk/DebTorrent/ConfigDir.py Mon Jul 16 05:48:06 2007
@@ -290,13 +290,13 @@
         except:
             configfile = False
             self.configfile = os.path.join(os.path.join(self.home_dir,DIRNAME),
-                                           'config'+self.config_type+'.ini')
-        
-        master_configfile = os.path.join(MASTER_CONFIG, 
-                                         'config'+self.config_type+'.ini')
-        
-        if self.checkConfig(master_configfile):
-            self.loadConfigFile(master_configfile)
+                                           self.config_type+'.conf')
+        
+            master_configfile = os.path.join(MASTER_CONFIG,
+                                             self.config_type+'.conf')
+            
+            if self.checkConfig(master_configfile):
+                self.loadConfigFile(master_configfile)
 
         if self.checkConfig(self.configfile):
             self.loadConfigFile(self.configfile)

Modified: debtorrent/trunk/DebTorrent/download_bt1.py
URL: http://svn.debian.org/wsvn/debtorrent/debtorrent/trunk/DebTorrent/download_bt1.py?rev=172&op=diff
==============================================================================
--- debtorrent/trunk/DebTorrent/download_bt1.py (original)
+++ debtorrent/trunk/DebTorrent/download_bt1.py Mon Jul 16 05:48:06 2007
@@ -60,8 +60,8 @@
 defaults = [
     # Not in the config file
     ('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'),
+        'a file in /etc/debtorrent will be used, followed by ' +
+        'a file in the .DebTorrent directory in the user\'s home directory'),
     ('priority', '',
         'a list of file priorities separated by commas, must be one per file, ' +
         '0 = highest, 1 = normal, 2 = lowest, -1 = download disabled'),
@@ -80,8 +80,7 @@
         'the number of days after which you wish to expire old cache data ' +
         '(0 = disabled)'),
     ('log_dir', '',
-        'directory to write the logfiles to (default is to use a logs ' +
-        'directory in the cache directory)'),
+        'directory to write the logfiles to (default is to use the cache directory)'),
     # Rate limits
     ('max_upload_rate', 0,
         'maximum kB/s to upload at (0 = no limit, -1 = automatic)'),

Copied: debtorrent/trunk/debtorrent-client.conf (from r170, debtorrent/trunk/config.debtorrent-client.ini)
URL: http://svn.debian.org/wsvn/debtorrent/debtorrent/trunk/debtorrent-client.conf?rev=172&op=diff
==============================================================================
--- debtorrent/trunk/config.debtorrent-client.ini (original)
+++ debtorrent/trunk/debtorrent-client.conf Mon Jul 16 05:48:06 2007
@@ -62,8 +62,8 @@
 #
 # Log Directory
 #
-# The directory to write the output logs to. If left blank, a "logs" directory
-# in the cache directory will be used.
+# The directory to write the output logs to. If left blank, the cache
+# directory will be used.
 #
 
 # log_dir = ""