summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDominik Riebeling <Dominik.Riebeling@gmail.com>2009-10-03 18:16:41 +0000
committerDominik Riebeling <Dominik.Riebeling@gmail.com>2009-10-03 18:16:41 +0000
commit9e25f04e5bd961d080921ed96ca2c6db54599285 (patch)
tree56b0829d50cfd7471bdb9fa86cfad64cec638043
parentbbe9d32383fcf058b0abcfa44be131f1a397dac6 (diff)
downloadrockbox-9e25f04e5bd961d080921ed96ca2c6db54599285.zip
rockbox-9e25f04e5bd961d080921ed96ca2c6db54599285.tar.gz
rockbox-9e25f04e5bd961d080921ed96ca2c6db54599285.tar.bz2
rockbox-9e25f04e5bd961d080921ed96ca2c6db54599285.tar.xz
Handle which not returning anything when searching for qmake.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@22895 a1c6a512-1295-4272-9138-f99709370657
-rwxr-xr-xrbutil/rbutilqt/deploy-release.py15
1 files changed, 10 insertions, 5 deletions
diff --git a/rbutil/rbutilqt/deploy-release.py b/rbutil/rbutilqt/deploy-release.py
index 5fbcf0e..aa1c574 100755
--- a/rbutil/rbutilqt/deploy-release.py
+++ b/rbutil/rbutilqt/deploy-release.py
@@ -74,12 +74,17 @@ def findqt():
'''Search for Qt4 installation. Return path to qmake.'''
print "Searching for Qt"
bins = ["qmake", "qmake-qt4"]
- result = ""
for binary in bins:
- q = which.which(binary)
- if len(q) > 0:
- result = checkqt(q)
- return result
+ try:
+ q = which.which(binary)
+ if len(q) > 0:
+ result = checkqt(q)
+ if not result == "":
+ return result
+ except:
+ print sys.exc_value
+
+ return ""
def checkqt(qmakebin):