Merge lp:~nuclearbob/utah/url-config into lp:utah

[Max Brustkern]

This branch uses url_argument to allow the use of remote config files. It will allow a script in a test branch to specify a config file via an lp: address, which should be useful in fixing lp:1087679.

[Max Brustkern (nuclearbob)]

This merge creates an issue when a config directory is specified that does not exist, i.e., /etc/utah/conf.d. I'm fixing that now.

review: Needs Fixing

[lp:~nuclearbob/utah/url-config]

775. By Max Brustkern on 2012-12-07

Changed routine to work with non-existent directories

[Max Brustkern (nuclearbob)]

I've made some changes to address that issue and retested. I'm retesting the bugfix now.

review: Needs Resubmitting

[Javier Collado (javier.collado)]

Due to the way `url_argument` works, for URLs other than `lp` ones, you can get
the same URL back

>>> url_argument('http://www.ubuntu.com')
'http://www.ubuntu.com'

If you just want to add support for `lp` URLs, then I'd advice
to add simple check like:
elif abspath.startswith('lp:')

to avoid problems with other URLs.

If you want to add support for `http` URLs, then a wrapper can be added to the
`utah.url` module to use `urlretrieve` when the value returned from
`urlargument` isn't a path to a local file.

[Javier Collado (javier.collado)]

Since this is related to a critical bug, I'm merging it using the first
alternative in my previous comment (abspath.startswith('lp:')).

If further work is needed to support other URLs, it can be addressed in a
separate bug.

review: Approve

[Max Brustkern (nuclearbob)]

Thanks for the fix.

=== modified file 'utah/config.py'
--- utah/config.py	2012-12-03 15:49:35 +0000
+++ utah/config.py	2012-12-07 20:41:20 +0000
@@ -29,6 +29,10 @@
 import subprocess
 import sys
 
+from argparse import ArgumentTypeError
+
+from utah.url import url_argument
+
 
 def getbridge():
     """
@@ -171,7 +175,7 @@
     else:
         # Otherwise, default to i386
         LOCALDEFAULTS['arch'] = 'i386'
-        
+
 # I'm not sure lsb_release is always around
 with open(os.devnull, 'w') as fnull:
     if subprocess.call(['which', 'lsb_release'],
@@ -203,12 +207,17 @@
 for path in paths:
     if path is not None:
         abspath = os.path.expanduser(path)
-        if os.path.isfile(abspath):
-            files.append(abspath)
-        elif os.path.isdir(abspath):
+        if os.path.isdir(abspath):
             for walkdir, _dirs, walkfiles in os.walk(abspath):
                 for walkfile in walkfiles:
                     files.append(os.path.join(abspath, walkdir, walkfile))
+        elif os.path.isfile(abspath):
+            files.append(abspath)
+        else:
+            try:
+                files.append(url_argument(abspath))
+            except ArgumentTypeError:
+                pass
 for conffile in files:
     if os.path.isfile(conffile) and os.path.getsize(conffile) > 0:
         with open(conffile) as fp: