From 9a29aa16463fbc72e188d7732ec78679d413dbd6 Mon Sep 17 00:00:00 2001 From: Jan Grulich Date: Mon, 23 Mar 2015 10:18:31 +0100 Subject: [PATCH] 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 - 3.2.1-4 +- cmake.prov: handle exceptions + * Wed Mar 18 2015 Rex Dieter 3.2.1-3 - cmake.prov: use /usr/bin/python (instead of /bin/python)