[cmake] cmake.prov: handle exceptions
Jan Grulich
jgrulich at fedoraproject.org
Mon Mar 23 09:18:44 UTC 2015
commit 9a29aa16463fbc72e188d7732ec78679d413dbd6
Author: Jan Grulich <jgrulich at redhat.com>
Date: Mon Mar 23 10:18:31 2015 +0100
cmake.prov: handle exceptions
cmake.prov | 6 +++++-
cmake.spec | 5 ++++-
2 files changed, 9 insertions(+), 2 deletions(-)
---
diff --git a/cmake.prov b/cmake.prov
index 65c2f08..15cc019 100644
--- a/cmake.prov
+++ b/cmake.prov
@@ -63,7 +63,11 @@ class CMakeParser:
def resolveCMakeModuleVersion(self, modulePath, cmakeModule, lowercase):
versionFile = ("%s/%s-config-version.cmake" if lowercase else "%s/%sConfigVersion.cmake") % (modulePath, cmakeModule)
- f = open(versionFile, 'r')
+ try:
+ f = open(versionFile, 'r')
+ except:
+ return None
+
for line in f:
line = line.strip()
diff --git a/cmake.spec b/cmake.spec
index 6e89c28..23059cb 100644
--- a/cmake.spec
+++ b/cmake.spec
@@ -13,7 +13,7 @@
Name: cmake
Version: 3.2.1
-Release: 3%{?dist}
+Release: 4%{?dist}
Summary: Cross-platform make system
Group: Development/Tools
@@ -233,6 +233,9 @@ update-mime-database %{?fedora:-n} %{_datadir}/mime &> /dev/null || :
%changelog
+* Mon Mar 23 2015 Daniel Vrátil <dvratil at redhat.com> - 3.2.1-4
+- cmake.prov: handle exceptions
+
* Wed Mar 18 2015 Rex Dieter <rdieter at fedoraproject.org> 3.2.1-3
- cmake.prov: use /usr/bin/python (instead of /bin/python)
More information about the scm-commits
mailing list