Merge remote branch 'cros/upstream' into tempbranch

client/tests/kvm/scripts/unattended.py

 #!/usr/bin/python
 """
 Simple script to setup unattended installs on KVM guests.
 """
 # -*- coding: utf-8 -*-
 import os, sys, shutil, tempfile, re, ConfigParser, glob, inspect
 import common
 
 
 SCRIPT_DIR = os.path.dirname(sys.modules[__name__].__file__)
@@ skipping 258 matching lines @@
             for va in v_attributes:
                 self._setattr(va)
 
         # Silly attribution just to calm pylint down...
         self.tftp = self.tftp
         if self.tftp:
             self.tftp = os.path.join(KVM_TEST_DIR, self.tftp)
             if not os.path.isdir(self.tftp):
                 os.makedirs(self.tftp)
 
-        self.cdrom_cd1 = os.path.join(KVM_TEST_DIR, self.cdrom_cd1)
+        if self.cdrom_cd1:
+            self.cdrom_cd1 = os.path.join(KVM_TEST_DIR, self.cdrom_cd1)
         self.cdrom_cd1_mount = tempfile.mkdtemp(prefix='cdrom_cd1_', dir='/tmp')
         if self.medium == 'nfs':
             self.nfs_mount = tempfile.mkdtemp(prefix='nfs_', dir='/tmp')
 
-        self.floppy = os.path.join(KVM_TEST_DIR, self.floppy)
-        if not os.path.isdir(os.path.dirname(self.floppy)):
-            os.makedirs(os.path.dirname(self.floppy))
+        if self.floppy:
+            self.floppy = os.path.join(KVM_TEST_DIR, self.floppy)
+            if not os.path.isdir(os.path.dirname(self.floppy)):
+                os.makedirs(os.path.dirname(self.floppy))
 
         self.image_path = KVM_TEST_DIR
         self.kernel_path = os.path.join(self.image_path, self.kernel)
         self.initrd_path = os.path.join(self.image_path, self.initrd)
 
 
     def _setattr(self, key):
         """
         Populate class attributes with contents of environment variables.
 
@@ skipping 281 matching lines @@
             self.setup_nfs()
         else:
             raise SetupError("Unexpected installation method %s" %
                              self.medium)
         print "Unattended install setup finished successfuly"
 
 
 if __name__ == "__main__":
     os_install = UnattendedInstall()
     os_install.setup()