On Mon, Jan 23, 2012 at 8:43 AM, lkcl luke <[email protected]> wrote:
> On Mon, Jan 23, 2012 at 12:41 AM, Michael Yang <[email protected]> wrote:
>> Sorry for the 3-commit bunch. I'm a newbie to git!
>
> que? que? ah well as long as the diff in the end is ok .
this was perfectly ok. so i don't quite understand why... ah you
_removed_ Vselovod. you need to learn how to properly resolve git
conflicts. you *mustn't* just go "oh i think my file is the
authoritative one".
when you get a git conflict resolve it MANUALLY, do NOT go "i will
overwrite whatever was there".
l.
lkcl@teenymac:~/pyjamas$ git diff
5043316bb9fbbbcbf7c07034a2acc613ee9889f2
e8250d14c775d9f037883b9824d9cf91c1dafbd3
diff --git a/CHANGELOG b/CHANGELOG
index 7e1d1ce..c969f3f 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,5 +1,9 @@
Changes made to Pyjamas since 0.7
---------------------------------
+ * pyjs/src/pyjs/linker.py workaround Issue #677, reverted cwd=pydir
+ so that compile works on Mac with python in /opt/local
+ By Michael Yang
+
* pyjs/src/pyjs/lib/string.py workaround Issue #658, mods to Template
class so that template strings substitution works.
By Phil Charlesworth
diff --git a/copyright b/copyright
index f653a28..7b28e56 100644
--- a/copyright
+++ b/copyright
@@ -83,6 +83,7 @@ Copyright: 2011 Greg Warner <[email protected]>
Copyright: 2011 Daniel Hopkins <[email protected]>
Copyright: 2011 Lex Berezhny <[email protected]>
Copyright: 2011 Anthon van der Neut <[email protected]>
+Copyright: 2012 Michael Yang <[email protected]>
Files: pyjs/src/pyjs/lib/socket.py
Copyright: 2008-2010, David P. D. Moss.
diff --git a/pyjs/src/pyjs/linker.py b/pyjs/src/pyjs/linker.py
index a8eec0f..e8abb17 100644
--- a/pyjs/src/pyjs/linker.py
+++ b/pyjs/src/pyjs/linker.py
@@ -137,7 +137,7 @@ def out_translate(platform, file_names, out_file, module_nam
stdout=subprocess.PIPE,
stderr=subprocess.PIPE,
shell=shell,
- cwd=os.path.dirname(file_names[0]),
+ cwd=pydir,
env=os.environ
)
stdout_value, stderr_value = proc.communicate('')
(END)
