Revised staging_install.py slightly to retain the original options
"target" and "local" as alternatives for "writeto" and "finalpath",
respectively. This retains backwards compatibility with a minimum
of effor. Also: Updated VERSION to go along with the merge of
pull request #175 from Tim Ansell.
diff --git a/VERSION b/VERSION
index f5f769a..9191d21 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-1.0.239
+1.0.240
diff --git a/common/staging_install.py b/common/staging_install.py
index 59e1567..7f4f15e 100755
--- a/common/staging_install.py
+++ b/common/staging_install.py
@@ -315,7 +315,9 @@
optionlist.remove(option)
debug = True
- # Check for options "link_from", "staging", "target", and "local"
+ # Check for options "link_from", "staging", "writeto", and "finalpath"
+ # "target" and "local" are also parsed for backwards compatibility
+ # although the names were misleading.
link_name = None
for option in optionlist[:]:
@@ -331,10 +333,10 @@
elif option[0] == 'staging' or option[0] == 'source':
optionlist.remove(option)
stagingdir = option[1]
- elif option[0] == 'writeto':
+ elif option[0] == 'writeto' or option[0] == 'target':
optionlist.remove(option)
writedir = option[1]
- elif option[0] == 'finalpath':
+ elif option[0] == 'finalpath' or option[0] == 'local':
optionlist.remove(option)
finaldir = option[1]
elif option[0] == 'variable':
