From a5dff0f103e553d117c3d367727921a1b13bd3af Mon Sep 17 00:00:00 2001 From: Thomas Goirand Date: Wed, 25 Feb 2015 18:12:32 +0100 Subject: [PATCH] Removed do-not-use-namespaced-oslo.patch --- .../patches/do-not-use-namespaced-oslo.patch | 30 ------------------- debian/patches/series | 1 - 2 files changed, 31 deletions(-) delete mode 100644 debian/patches/do-not-use-namespaced-oslo.patch diff --git a/debian/patches/do-not-use-namespaced-oslo.patch b/debian/patches/do-not-use-namespaced-oslo.patch deleted file mode 100644 index 9ce8d7c..0000000 --- a/debian/patches/do-not-use-namespaced-oslo.patch +++ /dev/null @@ -1,30 +0,0 @@ -Description: Do not use namespaced oslo - Package fails unit tests without this patch. -Author: Thomas Goirand -Forwarded: no -Last-Update: 2015-02-08 - ---- python-oslo.concurrency-1.4.1.orig/oslo_concurrency/openstack/common/fileutils.py -+++ python-oslo.concurrency-1.4.1/oslo_concurrency/openstack/common/fileutils.py -@@ -19,7 +19,7 @@ import logging - import os - import tempfile - --from oslo.utils import excutils -+from oslo_utils import excutils - - LOG = logging.getLogger(__name__) - ---- python-oslo.concurrency-1.4.1.orig/oslo_concurrency/processutils.py 2015-02-08 11:49:09.000000000 +0100 -+++ python-oslo.concurrency-1.4.1/oslo_concurrency/processutils.py 2015-02-08 11:49:15.000000000 +0100 -@@ -25,8 +25,8 @@ - import signal - import time - --from oslo.utils import importutils --from oslo.utils import strutils -+from oslo_utils import importutils -+from oslo_utils import strutils - import six - - from oslo_concurrency._i18n import _ diff --git a/debian/patches/series b/debian/patches/series index ea61944..25c0f24 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,2 +1 @@ -do-not-use-namespaced-oslo.patch install-missing-files.patch