More Python 3 compatibility.
authorCarl Hetherington <cth@carlh.net>
Sun, 24 May 2020 12:11:55 +0000 (14:11 +0200)
committerCarl Hetherington <cth@carlh.net>
Sun, 24 May 2020 12:11:55 +0000 (14:11 +0200)
cdist

diff --git a/cdist b/cdist
index d87238991baff78081eace87c31114625122c3cb..b53a8a267b7ba8b5928c55bbb662488e8bc6d874 100755 (executable)
--- a/cdist
+++ b/cdist
@@ -461,11 +461,11 @@ class Target(object):
             log_normal("Deprecated cscript package() method with no options parameter")
             packages = tree.call('package', tree.version)
 
-        if isinstance(packages, (str, unicode)):
-            copyfile(packages, os.path.join(output_dir, os.path.basename(devel_to_git(tree.git_commit, packages))))
-        else:
+        if isinstance(packages, list):
             for p in packages:
                 copyfile(p, os.path.join(output_dir, os.path.basename(devel_to_git(tree.git_commit, p))))
+        else:
+            copyfile(packages, os.path.join(output_dir, os.path.basename(devel_to_git(tree.git_commit, packages))))
 
     def build(self, project, checkout, options):
         tree = globals.trees.get(project, checkout, self)