From: Henning Schild <henning.schild@siemens.com>
Date: Tue, 5 Aug 2014 12:08:52 +0000 (+0200)
Subject: tools: config-create: use os.path.join to construct filenames
X-Git-Url: https://rtime.felk.cvut.cz/gitweb/jailhouse.git/commitdiff_plain/40ce7d8342e4716de8cb82531cb2de0c03c1f748

tools: config-create: use os.path.join to construct filenames

Use os.path.join instead of + '/'. The script is Linux only but it is
still cleaner.

Signed-off-by: Henning Schild <henning.schild@siemens.com>
Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>
---

diff --git a/tools/jailhouse-config-create b/tools/jailhouse-config-create
index 3bce969..187d59e 100755
--- a/tools/jailhouse-config-create
+++ b/tools/jailhouse-config-create
@@ -82,7 +82,7 @@ class PCICapability:
     @staticmethod
     def parse_pcicaps(dir):
         caps = []
-        f = input_open(dir + '/config', 'rb')
+        f = input_open(os.path.join(dir, 'config'), 'rb')
         f.seek(0x06)
         (status,) = struct.unpack('<H', f.read(2))
         # capability list supported?
@@ -140,8 +140,8 @@ class PCIDevice:
 
     @staticmethod
     def parse_pcidevice_sysfsdir(basedir, dir):
-        dpath = basedir + '/' + dir
-        dclass = input_readline(dpath + '/class')
+        dpath = os.path.join(basedir, dir)
+        dclass = input_readline(os.path.join(dpath, 'class'))
         if re.match(r'0x0604..', dclass):
             type = 'JAILHOUSE_PCI_TYPE_BRIDGE'
         else:
@@ -294,7 +294,7 @@ def input_readline(name, optional=False):
 
 def input_listdir(dir, wildcards):
     for w in wildcards:
-        inputs['dirs'].add(dir + '/' + w)
+        inputs['dirs'].add(os.path.join(dir, w))
     if options.generate_collector:
         return []
     dirs = os.listdir(options.root + dir)