Permalink
Browse files

defensive

  • Loading branch information...
1 parent 69769f7 commit 9628b13ba4b4a529913bd9d908f4804f85035ec5 @JPMoresmau committed Feb 26, 2013
@@ -2,7 +2,7 @@
<feature
id="net.sf.eclipsefp.haskell"
label="%bundleName"
- version="2.5.0"
+ version="2.5.1"
provider-name="%bundleVendor">
<description>
@@ -158,7 +158,7 @@ available at http://www.eclipse.org/legal/epl-v10.html.
id="net.sf.eclipsefp.haskell.buildwrapper"
download-size="0"
install-size="0"
- version="2.5.0"
+ version="2.5.1"
unpack="false"/>
<plugin
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: %bundleName
Bundle-SymbolicName: net.sf.eclipsefp.haskell.buildwrapper;singleton:=true
-Bundle-Version: 2.5.0
+Bundle-Version: 2.5.1
Bundle-Activator: net.sf.eclipsefp.haskell.buildwrapper.BuildWrapperPlugin
Bundle-Vendor: %bundleVendor
Bundle-Localization: plugin
@@ -323,6 +323,14 @@ private void addEditorStanza(IFile file,List<String> command){
public Collection<NameDef> build1LongRunning(IFile file,boolean end){
//BuildFlagInfo i=getBuildFlags(file);
+ if (bwPath==null){
+ if (!showedNoExeError){
+ BuildWrapperPlugin.logError(BWText.error_noexe, null);
+ showedNoExeError=true;
+ }
+ return new ArrayList<NameDef>();
+ }
+ showedNoExeError=false;
try {
Process p=buildProcesses.get(file);
if (p==null){
@@ -1125,7 +1133,7 @@ private CabalPackage parsePackage(JSONObject obj){
* @param pb
*/
private synchronized void addBuildWrapperPath(ProcessBuilder pb){
- if (needPath==null || needPath.booleanValue()){
+ if (needPath==null || needPath.booleanValue() && bwPath!=null){
needPath=false;
String path=new File(bwPath).getParent();
if (path!=null){

0 comments on commit 9628b13

Please sign in to comment.