Skip to content
Permalink
Browse files

[sextante] fixed #7525 (problem with checking if external app is inst…

…alled)
  • Loading branch information
volaya committed Apr 6, 2013
1 parent 82a36f9 commit eae1a97178582efb12eacff0151acbf184758fed
Showing with 9 additions and 8 deletions.
  1. +7 −6 python/plugins/sextante/grass/GrassUtils.py
  2. +2 −2 python/plugins/sextante/saga/SagaUtils.py
@@ -16,8 +16,6 @@
* *
***************************************************************************
"""
from sextante.tests.TestData import points
import traceback

__author__ = 'Victor Olaya'
__date__ = 'August 2012'
@@ -26,9 +24,12 @@
__revision__ = '$Format:%H$'

import os
from sextante.core.SextanteUtils import SextanteUtils, mkdir
from PyQt4.QtCore import *
import traceback
import subprocess
from sextante.tests.TestData import points
from sextante.core.SextanteConfig import SextanteConfig
from sextante.core.SextanteUtils import SextanteUtils, mkdir
from sextante.core.SextanteLog import SextanteLog
import stat
import shutil
@@ -336,10 +337,10 @@ def checkGrassIsInstalled(ignoreRegistrySettings=False):
return ("The specified GRASS folder does not contain a valid set of GRASS modules.\n"
+ "Please, go to the SEXTANTE settings dialog, and check that the GRASS\n"
+ "folder is correctly configured")


settings = QSettings()
if not ignoreRegistrySettings:
GRASS_INSTALLED = "/SextanteQGIS/GrassInstalled"
settings = QSettings()
GRASS_INSTALLED = "/SextanteQGIS/GrassInstalled"
if settings.contains(GRASS_INSTALLED):
return

@@ -127,9 +127,9 @@ def checkSagaIsInstalled(ignoreRegistrySettings=False):
+ "Please, go to the SEXTANTE settings dialog, and check that the SAGA\n"
+ "folder is correctly configured")

settings = QSettings()
if not ignoreRegistrySettings:
SAGA_INSTALLED = "/SextanteQGIS/SagaInstalled"
settings = QSettings()
SAGA_INSTALLED = "/SextanteQGIS/SagaInstalled"
if settings.contains(SAGA_INSTALLED):
return

0 comments on commit eae1a97

Please sign in to comment.
You can’t perform that action at this time.