Changeset 3045

Timestamp:

10/17/06 14:28:56 (18 years ago)

Author:

jerome

Message:

Added a patch by Andrew Ross from Parakeet Print Quota.

Location:

pykota/trunk

Files:

• CREDITS (modified) (2 diffs)
• pykota/tool.py (modified) (2 diffs)

pykota/trunk/CREDITS

@@ -73 +73 @@
   - Baris Cicek - Turkish translation.
   - Kanakorn Horsiritham - Wrote phpPykotaAdmin.
-  - Tsang Yu Pong, Teddy - PHC Wing Kwong College - Chinese (Trad.) translation 
-  - Marcus Fl�o de Lima - Universidade Federal de Minas Gerais : Brazilian PyKota+LDAP Documentation
+  - Tsang Yu Pong, Teddy - PHC Wing Kwong College - Chinese (Trad.) translation
+  - Marcus Fl�o de Lima - Universidade Federal de Minas Gerais : 
+    Brazilian PyKota+LDAP Documentation
   - Rong-En Fan - Helped improve the PJL stuff.
   - Michal Dobroczynski - Polish translation.
@@ -81 +82 @@
   - Brandon Holbrook - Mississipi State University : improved waitprinter.sh
   - Brian Glogower - Worked on gnuplot scripts
+  - Andrew Ross - Parakeet Print Quota : Provided a patch to allow the
+    configuration files directory to be set at run time.
 
 ==============================================================

pykota/trunk/pykota/tool.py

@@ -162 +162 @@
     def deferredInit(self) :        
         """Deferred initialization."""
-        # try to find the configuration files in user's 'pykota' home directory.
-        try :
-            self.pykotauser = pwd.getpwnam("pykota")
-        except KeyError :    
-            self.pykotauser = None
-            confdir = "/etc/pykota"
-            missingUser = 1
-        else :    
-            confdir = self.pykotauser[5]
-            missingUser = 0
+        confdir = os.environ.get("PYKOTA_HOME")
+        environHome = True
+        missingUser = False
+        if confdir is None :
+            environHome = False
+            # check for config files in the 'pykota' user's home directory.
+            try :
+                self.pykotauser = pwd.getpwnam("pykota")
+                confdir = self.pykotauser[5]
+            except KeyError :    
+                self.pykotauser = None
+                confdir = "/etc/pykota"
+                missingUser = True
             
         self.config = config.PyKotaConfig(confdir)
@@ -188 +191 @@
         if self.defaultToCLocale :
             self.printInfo("Incorrect locale settings. PyKota falls back to the default locale.", "warn")
-        if missingUser :     
-            self.printInfo("The 'pykota' system account is missing. Configuration files were searched in /etc/pykota instead.", "warn")
+        if environHome :
+            self.printInfo("PYKOTA_HOME environment variable is set. Configuration files were searched in %s" % confdir, "info")
+        else :
+            if missingUser :     
+                self.printInfo("The 'pykota' system account is missing. Configuration files were searched in %s instead." % confdir, "warn")
         
         self.logdebug("Charset detected from locale settings : %s" % self.localecharset)