diff options
author | Richard Linden <none@none> | 2013-09-09 20:19:36 -0700 |
---|---|---|
committer | Richard Linden <none@none> | 2013-09-09 20:19:36 -0700 |
commit | ddd9d1396cd378cbcd332d26d8b6b7092716c1bc (patch) | |
tree | 767a40da9fdd2f3ae0c89b1d6cd5135884c4e8c9 /indra/lib | |
parent | 21ab67416d471a90b343052c986478c9dd65ae79 (diff) | |
parent | 52da9f5f49e0e300943abc3afa6944e6bee0cdd1 (diff) |
merge
Diffstat (limited to 'indra/lib')
-rwxr-xr-x | indra/lib/python/indra/util/llmanifest.py | 18 |
1 files changed, 14 insertions, 4 deletions
diff --git a/indra/lib/python/indra/util/llmanifest.py b/indra/lib/python/indra/util/llmanifest.py index 9cb830a2db..54049b5545 100755 --- a/indra/lib/python/indra/util/llmanifest.py +++ b/indra/lib/python/indra/util/llmanifest.py @@ -392,11 +392,21 @@ class LLManifest(object): raise ManifestError, "Should be something at path " + path self.created_paths.append(path) - def put_in_file(self, contents, dst): + def put_in_file(self, contents, dst, src=None): # write contents as dst - f = open(self.dst_path_of(dst), "wb") - f.write(contents) - f.close() + dst_path = self.dst_path_of(dst) + f = open(dst_path, "wb") + try: + f.write(contents) + finally: + f.close() + + # Why would we create a file in the destination tree if not to include + # it in the installer? The default src=None (plus the fact that the + # src param is last) is to preserve backwards compatibility. + if src: + self.file_list.append([src, dst_path]) + return dst_path def replace_in(self, src, dst=None, searchdict={}): if dst == None: |