summaryrefslogtreecommitdiff
path: root/morphlib/artifact.py
diff options
context:
space:
mode:
authorLars Wirzenius <lars.wirzenius@codethink.co.uk>2014-07-15 12:23:49 +0000
committerLars Wirzenius <lars.wirzenius@codethink.co.uk>2014-07-15 12:23:49 +0000
commite8adedb8f3f27d9212caf277b8e8f7c6792a20c2 (patch)
treef8460c9ff73cea780d944f18d1bab49f2653b1cf /morphlib/artifact.py
parent3f686a074fdb66e75e67e276d21bdc604b34920c (diff)
parent40a5c752de62dd1b3ef3ec0850f1f24e7af67052 (diff)
downloadmorph-e8adedb8f3f27d9212caf277b8e8f7c6792a20c2.tar.gz
Fix JSON file handling to be binary filename safe
Reviewed-by: Lars Wirzenius Reviewed-by: Pedro Alvarez
Diffstat (limited to 'morphlib/artifact.py')
-rw-r--r--morphlib/artifact.py10
1 files changed, 5 insertions, 5 deletions
diff --git a/morphlib/artifact.py b/morphlib/artifact.py
index 20fdb185..da6d3763 100644
--- a/morphlib/artifact.py
+++ b/morphlib/artifact.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2012, 2013 Codethink Limited
+# Copyright (C) 2012, 2013, 2014 Codethink Limited
#
# 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
@@ -56,13 +56,13 @@ class Artifact(object):
def basename(self): # pragma: no cover
return '%s.%s.%s' % (self.cache_key,
- self.source.morphology['kind'],
- self.name)
+ str(self.source.morphology['kind']),
+ str(self.name))
def metadata_basename(self, metadata_name): # pragma: no cover
return '%s.%s.%s.%s' % (self.cache_key,
- self.source.morphology['kind'],
- self.name,
+ str(self.source.morphology['kind']),
+ str(self.name),
metadata_name)
def get_dependency_prefix_set(self):