Title: [101930] trunk/Tools
- Revision
- 101930
- Author
- [email protected]
- Date
- 2011-12-03 08:37:50 -0800 (Sat, 03 Dec 2011)
Log Message
Small fix for my previous patch. Do not try to delete a member
of a dictionary that does not exist.
Reviewed by Gustavo Noronha Silva.
* gtk/run-with-jhbuild:
(install_and_run_jhbuild):
Modified Paths
Diff
Modified: trunk/Tools/ChangeLog (101929 => 101930)
--- trunk/Tools/ChangeLog 2011-12-03 15:55:51 UTC (rev 101929)
+++ trunk/Tools/ChangeLog 2011-12-03 16:37:50 UTC (rev 101930)
@@ -1,5 +1,15 @@
2011-12-03 Martin Robinson <[email protected]>
+ Small fix for my previous patch. Do not try to delete a member
+ of a dictionary that does not exist.
+
+ Reviewed by Gustavo Noronha Silva.
+
+ * gtk/run-with-jhbuild:
+ (install_and_run_jhbuild):
+
+2011-12-03 Martin Robinson <[email protected]>
+
Fix jhbuild installation for people who have unusual MAKE environment
variables such as 'make -j4' as the jhbuild build does not handle it.
Modified: trunk/Tools/gtk/run-with-jhbuild (101929 => 101930)
--- trunk/Tools/gtk/run-with-jhbuild 2011-12-03 15:55:51 UTC (rev 101929)
+++ trunk/Tools/gtk/run-with-jhbuild 2011-12-03 16:37:50 UTC (rev 101930)
@@ -39,7 +39,8 @@
# jhbuild is really unhappy about having MAKE defined to something like 'make -j4'
# so we just undefine it here.
env_without_make = dict(os.environ)
- del env_without_make['MAKE']
+ if 'MAKE' in env_without_make:
+ del env_without_make['MAKE']
process = subprocess.Popen(['./autogen.sh', '--prefix=%s' % installation_prefix],
cwd=jhbuild_source_path, env=env_without_make)
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
