From 47140293b6d23712a023a5a64da099757f8e4da4 Mon Sep 17 00:00:00 2001
From: Ian Wienand <iwienand@redhat.com>
Date: Tue, 2 May 2017 15:32:47 +1000
Subject: [PATCH] Move blockdevicesetupexception.py into blockdevice.py

Less is more when it comes to code :)

Change-Id: I925ed62bdc808f0e07862f6e0905e80b50fbe942
---
 diskimage_builder/block_device/blockdevice.py   |  6 ++++--
 .../block_device/blockdevicesetupexception.py   | 17 -----------------
 .../block_device/level0/localloop.py            |  4 ++--
 .../block_device/level1/partitioning.py         |  4 ++--
 4 files changed, 8 insertions(+), 23 deletions(-)
 delete mode 100644 diskimage_builder/block_device/blockdevicesetupexception.py

diff --git a/diskimage_builder/block_device/blockdevice.py b/diskimage_builder/block_device/blockdevice.py
index 769b9fa2e..c144e89e2 100644
--- a/diskimage_builder/block_device/blockdevice.py
+++ b/diskimage_builder/block_device/blockdevice.py
@@ -22,14 +22,16 @@ import yaml
 
 from stevedore import extension
 
-from diskimage_builder.block_device.blockdevicesetupexception \
-    import BlockDeviceSetupException
 from diskimage_builder.graph.digraph import Digraph
 
 
 logger = logging.getLogger(__name__)
 
 
+class BlockDeviceSetupException(Exception):
+    pass
+
+
 class BlockDevice(object):
     """Handles block devices.
 
diff --git a/diskimage_builder/block_device/blockdevicesetupexception.py b/diskimage_builder/block_device/blockdevicesetupexception.py
deleted file mode 100644
index b0e42356d..000000000
--- a/diskimage_builder/block_device/blockdevicesetupexception.py
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 2016 Andreas Florath (andreas@florath.net)
-#
-# Licensed under the Apache License, Version 2.0 (the "License"); you may
-# not use this file except in compliance with the License. You may obtain
-# a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
-# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
-# License for the specific language governing permissions and limitations
-# under the License.
-
-
-class BlockDeviceSetupException(Exception):
-    pass
diff --git a/diskimage_builder/block_device/level0/localloop.py b/diskimage_builder/block_device/level0/localloop.py
index 78cf55598..e71c9601b 100644
--- a/diskimage_builder/block_device/level0/localloop.py
+++ b/diskimage_builder/block_device/level0/localloop.py
@@ -16,8 +16,8 @@ import logging
 import os
 import subprocess
 
-from diskimage_builder.block_device.blockdevicesetupexception \
-    import BlockDeviceSetupException
+from diskimage_builder.block_device.blockdevice import \
+    BlockDeviceSetupException
 from diskimage_builder.block_device.plugin_base import NodePluginBase
 from diskimage_builder.block_device.tree_config import TreeConfig
 from diskimage_builder.block_device.utils import parse_abs_size_spec
diff --git a/diskimage_builder/block_device/level1/partitioning.py b/diskimage_builder/block_device/level1/partitioning.py
index 72dc9e475..3b1cd54ef 100644
--- a/diskimage_builder/block_device/level1/partitioning.py
+++ b/diskimage_builder/block_device/level1/partitioning.py
@@ -17,8 +17,8 @@ import os
 
 from subprocess import CalledProcessError
 
-from diskimage_builder.block_device.blockdevicesetupexception \
-    import BlockDeviceSetupException
+from diskimage_builder.block_device.blockdevice import \
+    BlockDeviceSetupException
 from diskimage_builder.block_device.level1.mbr import MBR
 from diskimage_builder.block_device.plugin_base import PluginBase
 from diskimage_builder.block_device.tree_config import TreeConfig