diff options
| author | Richard Maw <richard.maw@codethink.co.uk> | 2014-07-11 17:37:54 +0000 |
|---|---|---|
| committer | Richard Maw <richard.maw@codethink.co.uk> | 2014-07-11 17:37:54 +0000 |
| commit | 40a5c752de62dd1b3ef3ec0850f1f24e7af67052 (patch) | |
| tree | 960834307ff18840454a8c1dd6ad01376aecb89d /morphlib/artifact.py | |
| parent | 1a5e3e748a5ea4f48e3e88fa3859db4c186d6ba5 (diff) | |
| download | morph-40a5c752de62dd1b3ef3ec0850f1f24e7af67052.tar.gz | |
Allow non-unicode paths to be hardlinked into staging areasbaserock/richardmaw/bugfix/unicode-safe-paths
Parts of the morphology go into the name of the staging area, so it
helps to convert them into a str, so later attempts to join it with
another string don't result in a unicode string.
pyfilesystem insists that file paths must be unicode. It is incorrect,
but we passed something unicode compatible in in the first place, so we
can get away with converting it back to a bytestring.
Diffstat (limited to 'morphlib/artifact.py')
| -rw-r--r-- | morphlib/artifact.py | 10 |
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): |