From 78e6f72576521f823d68abc20a2944711fdb81df Mon Sep 17 00:00:00 2001 From: Pierre-Yves Chibon Date: Feb 10 2012 21:18:43 +0000 Subject: Use exception instead of sytem exit. --- diff --git a/r2spec/rpackage.py b/r2spec/rpackage.py index 8bb0858..fc5354d 100644 --- a/r2spec/rpackage.py +++ b/r2spec/rpackage.py @@ -31,7 +31,7 @@ import urllib2 from tarfile import TarError -from r2spec import get_logger, get_rpm_tag +from r2spec import get_logger, get_rpm_tag, R2specError def package_in_repo(url, name): @@ -225,9 +225,9 @@ class RPackage(object): self.log.info( 'Could not find package "%s" in any of the congifure repos' \ % self.name) - print 'Could not find package "%s" in any of the congifure repos' \ - % self.name - sys.exit(1) + raise R2specError( + 'Could not find package "%s" in any of the configured repos' \ + % self.name) self.up_version = version self.down_version = version.replace('-', '.') self.url = self.config.get(repo, 'url') diff --git a/r2spec/spec.py b/r2spec/spec.py index 64299a1..7e4d87b 100644 --- a/r2spec/spec.py +++ b/r2spec/spec.py @@ -26,7 +26,7 @@ import os import re import sys from jinja2 import Template -from r2spec import get_logger, get_rpm_tag +from r2spec import get_logger, get_rpm_tag, R2specError def format_description(description): @@ -231,9 +231,8 @@ class Spec: mytemplate = Template(tplfile) self.spec = mytemplate.render(self.__dict) except IOError, err: - self.log.info('Cannot read the file %s' % template) self.log.debug('ERROR: %s' % err) - sys.exit(1) + raise R2specError('Cannot read the file %s' % template) def get_specfile(self): """ Return the path to the spec file.