CP-49680: Support unquoted values in /etc/xensource-inventory

Signed-off-by: Bernhard Kaindl <[email protected]>

tests/integration/dom0-template/etc/xensource-inventory

@@ -12,8 +12,9 @@ INSTALLATION_UUID='58d847c4-da26-4d48-a47e-0f4d8db53f52'
 PRODUCT_VERSION_TEXT_SHORT='8 Cloud'
 BRAND_CONSOLE='XenCenter'
 PRODUCT_NAME='xenenterprise'
-MANAGEMENT_INTERFACE='xenbr0'
-COMPANY_PRODUCT_BRAND='XenServer'
+CP49680_NOTE='Test xen-bugtool to tolerate empty and unquoted values'
+MANAGEMENT_INTERFACE=
+COMPANY_PRODUCT_BRAND=XenServer
 PLATFORM_VERSION='3.3.0'
 BUILD_NUMBER='cloud'
 PLATFORM_NAME='XCP'

xen-bugtool

@@ -2358,7 +2358,7 @@ def pidof(name):
     return pids
 
 
-def readKeyValueFile(filename, allowed_keys = None, strip_quotes = True, assert_quotes = True):
+def readKeyValueFile(filename, allowed_keys = None, strip_quotes = True):
     """ Reads a KEY=Value style file (e.g. xensource-inventory). Returns a
     dictionary of key/values in the file.  Not designed for use with large files
     as the file is read entirely into memory."""
@@ -2375,8 +2375,6 @@ def readKeyValueFile(filename, allowed_keys = None, strip_quotes = True, assert_
 
     if strip_quotes:
         def quotestrip(x):
-            if assert_quotes:
-                assert x.startswith("'") and x.endswith("'")
             return x.strip("'")
         defs = [ (a, quotestrip(b)) for (a,b) in defs ]