From: Bert Vermeulen <redacted>
Date: Fri, 29 Nov 2013 12:59:51 +0000 (+0100)
Subject: Python 3.2 and portability fixes.
X-Git-Tag: libsigrokdecode-0.3.0~212
X-Git-Url: https://sigrok.org/gitweb/?p=libsigrokdecode.git;a=commitdiff_plain;h=169f42726fcd44ca9a98c914b835ae6ff31295c3;ds=sidebyside

Python 3.2 and portability fixes.
---

diff --git a/tools/install-decoders b/tools/install-decoders
index 8134539..4a6e1d9 100755
--- a/tools/install-decoders
+++ b/tools/install-decoders
@@ -2,7 +2,7 @@
 #
 # This file is part of the libsigrokdecode project.
 #
-# Copyright (C) 2012 Bert Vermeulen <bert@biot.com>
+# Copyright (C) 2013 Bert Vermeulen <bert@biot.com>
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -50,13 +50,16 @@ def install(srcdir, dstdir):
             col = 0
         print(msg, end='')
         col += len(msg)
-        pd_dst = dstdir + '/' + pd
+        pd_dst = os.path.join(dstdir, pd)
         try:
             os.mkdir(pd_dst)
-        except FileExistsError:
-            pass
+        except OSError as e:
+            if e.errno != os.errno.EEXIST:
+                raise
+            else:
+                pass
         for f in install_list:
-            copy(pd_dir + '/' + f, pd_dst)
+            copy(os.path.join(pd_dir, f), pd_dst)
     print()