[llvm-commits] [zorg] r152852 - in /zorg/trunk/lnt/lnt: lnttool/import_data.py server/config.py

[Daniel Dunbar]

Author: ddunbar
Date: Thu Mar 15 16:41:32 2012
New Revision: 152852

URL: http://llvm.org/viewvc/llvm-project?rev=152852&view=rev
Log:
[LNT] lnt.lnttool.import_data: Factor out
lnt.server.config.get_config_from_path().

Modified:
    zorg/trunk/lnt/lnt/lnttool/import_data.py
    zorg/trunk/lnt/lnt/server/config.py

Modified: zorg/trunk/lnt/lnt/lnttool/import_data.py
URL: http://llvm.org/viewvc/llvm-project/zorg/trunk/lnt/lnt/lnttool/import_data.py?rev=152852&r1=152851&r2=152852&view=diff
==============================================================================
--- zorg/trunk/lnt/lnt/lnttool/import_data.py (original)
+++ zorg/trunk/lnt/lnt/lnttool/import_data.py Thu Mar 15 16:41:32 2012
@@ -37,18 +37,10 @@
     if len(args) < 2:
         parser.error("invalid number of arguments")
 
-    config = args.pop(0)
+    path = args.pop(0)
 
-    # Accept paths to config files, or to directories containing 'lnt.cfg'.
-    if os.path.isdir(config):
-        tmp = os.path.join(config, 'lnt.cfg')
-        if os.path.exists(tmp):
-            config = tmp
-
-    # Load the config file.
-    config_data = {}
-    exec open(config) in config_data
-    config = lnt.server.config.Config.fromData(config, config_data)
+    # Load the LNT configuration.
+    config = lnt.server.config.get_config_from_path(path)
 
     # Get the database.
     db = config.get_database(opts.database, echo=opts.show_sql)

Modified: zorg/trunk/lnt/lnt/server/config.py
URL: http://llvm.org/viewvc/llvm-project/zorg/trunk/lnt/lnt/server/config.py?rev=152852&r1=152851&r2=152852&view=diff
==============================================================================
--- zorg/trunk/lnt/lnt/server/config.py (original)
+++ zorg/trunk/lnt/lnt/server/config.py Thu Mar 15 16:41:32 2012
@@ -125,3 +125,16 @@
 
         raise NotImplementedError,"unable to import to version %r database" % (
             db_entry.db_version,)
+
+def get_config_from_path(path):
+    # Accept paths to config files or to directories containing 'lnt.cfg'.
+    if os.path.isdir(path):
+        config_path = os.path.join(path, 'lnt.cfg')
+    else:
+        config_path = path
+
+    # Load the config file.
+    config_data = {}
+    exec open(config_path) in config_data
+    return lnt.server.config.Config.fromData(config_path, config_data)
+