Merge lp:~ilowe/vmbuilder/appliances-seedfile into lp:~aheck/vmbuilder/appliances

[Iain Lowe]

[Iain Lowe (ilowe)]

Sorry I put three changes in the same commit. I just threw them in there.

[Andreas Heck (aheck)]

Thanks, great patch :)

review: Approve

=== modified file 'vainstall'
--- vainstall	2009-08-31 21:20:39 +0000
+++ vainstall	2009-09-12 04:13:32 +0000
@@ -40,9 +40,16 @@
     else:
         return False
 
-def get_seed_url(appliance):
+def run_as_root(appliance):
+    return os.getuid() == 0
+
+
+def get_seed_url(appliance, seedfile=None):
     """Get the URL of the seed file for a given appliance"""
 
+    if seedfile:
+        return 'file://%s' % os.path.abspath(seedfile)
+
     # use apt-get to get the URL of our appliance package
     cmd = 'apt-get -qq --print-uris install ' + appliance + '|grep ' + appliance
     cmd += "|cut -d ' ' -f 1|tr -d \"'\n\""
@@ -53,54 +60,71 @@
     # replace the '.deb' extension with '.seed' extension to get the url of the
     # seedfile for the corresponding package version
     url = re.sub('\.deb$', '.seed', url)
-
+    
     return url
 
-if len(sys.argv) != 2:
-    usage()
-
-if sys.argv[1] == '--help':
-    usage(False)
-
-appliance = sys.argv[1]
-
-if not package_exists(appliance):
-    sys.stderr.write("Couldn't find a package with the name '" + appliance + "'\n")
-    sys.exit(1)
-
-if not is_appliance(appliance):
-    sys.stderr.write("Package with the name '" + appliance + "' exits but is no appliance\n")
-    sys.exit(1)
-
-if os.getuid() != 0:
-    sys.stderr.write('This program must be run as root!\n')
-    sys.exit(1)
-
-seedurl = get_seed_url(appliance)
-sys.stdout.write('Getting the seed file for this appliance from: ' + seedurl + '\n')
-
-seeddata = ''
-
-try:
-    f = urllib2.urlopen(seedurl)
-    blocksize = 4096
-
-    curblock = f.read(blocksize)
-    while curblock:
-        seeddata += curblock
+def get_seeddata(seedurl):
+    sys.stdout.write('Getting the seed file for this appliance from: ' + seedurl + '\n')
+    seeddata = ''
+
+    try:
+        f = urllib2.urlopen(seedurl)
+        blocksize = 4096
+
         curblock = f.read(blocksize)
-    f.close()
-except urllib2.HTTPError as e:
-    if e.getcode() == 404:
-        sys.stderr.write("\nError: Seedfile for the appliance '" + appliance + "' couldn't be found\n")
-        sys.stderr.write("It was expected at the URL " + seedurl + '\n')
-    else:
+        while curblock:
+            seeddata += curblock
+            curblock = f.read(blocksize)
+        f.close()
+        
+        return seeddata
+    except urllib2.HTTPError as e:
+        if e.getcode() == 404:
+            sys.stderr.write("\nError: Seedfile for the appliance '" + appliance + "' couldn't be found\n")
+            sys.stderr.write("It was expected at the URL " + seedurl + '\n')
+        else:
+            sys.stderr.write(str(e) + '\n')
+
+        sys.exit(1)
+    except Exception as e:
         sys.stderr.write(str(e) + '\n')
-
-    sys.exit(1)
-except Exception as e:
-    sys.stderr.write(str(e) + '\n')
-    sys.exit(1)
-
-os.system('echo "' + seeddata + '" | debconf-set-selections')
-os.system('apt-get install ' + appliance)
+        sys.exit(1)
+
+def preseed_and_install(appliance, seedurl):
+    p = subprocess.Popen(['debconf-set-selections'], stdin=subprocess.PIPE)
+    p.stdin.write(get_seeddata(seedurl))
+    p.stdin.flush()
+    p.stdin.close()
+    p.wait()
+    
+    subprocess.call(['apt-get', 'install', appliance])
+
+if __name__ == '__main__':
+    from optparse import OptionParser
+
+    p = OptionParser('''%prog [options] <APPLIANCENAME>
+
+This program installs a single virtual appliance package''')
+
+    p.add_option('--preseed', dest='seedfile', default=None, help='Preseed override file for this virtual appliance')
+
+    options, args = p.parse_args()
+
+    if not args:
+        p.print_help()
+        sys.exit(1)
+
+    appliance = args[0]
+
+    checks = (
+        (package_exists, "Couldn't find a package with the name '" + appliance + "'"),
+        (is_appliance, "Package with the name '" + appliance + "' exits but is no appliance"),
+        (run_as_root, 'This program must be run as root!')
+    )
+
+    for check_f, msg in checks:
+        if not check_f(appliance):
+            sys.stderr.write(msg + '\n')
+            sys.exit(1)
+
+    preseed_and_install(appliance, get_seed_url(appliance, seedfile=options.seedfile))