diff --git a/horizon-ignore-cache-dir.patch b/horizon-ignore-cache-dir.patch new file mode 100644 index 0000000..d8b8a28 --- /dev/null +++ b/horizon-ignore-cache-dir.patch @@ -0,0 +1,32 @@ +From 39e252ad056ff65c7c326095938deb1eb50c4b40 Mon Sep 17 00:00:00 2001 +From: Kiall Mac Innes +Date: Wed, 21 Mar 2012 12:19:30 +0000 +Subject: [PATCH 1/1] Fixes bug #959262 - Prevent a failure to create the cache directory from causing an exception. + +Change-Id: Ia80b50b32f5e3d0e76f4a1b251e23bbd3c70666e +--- + novaclient/base.py | 8 ++++---- + 1 files changed, 4 insertions(+), 4 deletions(-) + +diff --git a/novaclient/base.py b/novaclient/base.py +index 4badc84..ec78aa6 100644 +--- a/novaclient/base.py ++++ b/novaclient/base.py +@@ -114,10 +114,10 @@ class Manager(utils.HookableMixin): + try: + os.makedirs(cache_dir, 0755) + except OSError as e: +- if e.errno == errno.EEXIST: +- pass +- else: +- raise ++ # NOTE(kiall): This is typicaly either permission denied while ++ # attempting to create the directory, or the directory ++ # already exists. Either way, don't fail. ++ pass + + resource = obj_class.__name__.lower() + filename = "%s-%s-cache" % (resource, cache_type.replace('_', '-')) +-- +1.7.4.1 + diff --git a/python-novaclient.spec b/python-novaclient.spec index eebc44e..efbf40f 100644 --- a/python-novaclient.spec +++ b/python-novaclient.spec @@ -1,6 +1,6 @@ Name: python-novaclient Version: 2012.1 -Release: 0.3.rc1%{?dist} +Release: 0.4.rc1%{?dist} Summary: Python API and CLI for OpenStack Nova Group: Development/Languages @@ -9,6 +9,7 @@ URL: http://pypi.python.org/pypi/python-novaclient Source0: http://launchpad.net/nova/essex/essex-rc1/+download/python-novaclient-%{version}~rc1.tar.gz Patch1: novaclient-remove-argparse-from-egg-requires.patch +Patch2: horizon-ignore-cache-dir.patch BuildArch: noarch BuildRequires: python-setuptools @@ -42,6 +43,7 @@ This package contains auto-generated documentation. %setup -q %patch1 -p1 +%patch2 -p1 %build %{__python} setup.py build @@ -68,6 +70,9 @@ rm -fr html/.doctrees html/.buildinfo %doc html %changelog +* Thu Mar 22 2012 Pádraig Brady 2012.1-0.4.rc1 +- Avoid a horizon issue trying to write to /var/www (#801202) + * Wed Mar 21 2012 Pádraig Brady 2012.1-0.3.rc1 - Update to essex-rc1