Revert "Merge branch 'liw/hardlink-staging-area-pre-rebase'"

This reverts commit c859d70d86423a52bc7053abf64e9ca21f62a487, reversing
changes made to 3085a672d1e8b5177be33f0463385de72a0ef5bf.

Unfortunately, hardlinking and linux-user-chroot both break builds
in various ways. Hardlinking breaks the bootstrap process by creating
symlinks like /usr/libexec that can then not be overwritten with real
files by install scripts from morphologies like gcc.

linux-user-chroot caused problems by breaking privileged operations such
as chgrp and CAP_SETFCAP. As a consequence, chunks like util-linux and
libcap can no longer be built.

1 files changed, 2 insertions, 17 deletions

diff --git a/morphlib/stagingarea_tests.py b/morphlib/stagingarea_tests.py
index 15131272..3230b9e3 100644
--- a/morphlib/stagingarea_tests.py
+++ b/morphlib/stagingarea_tests.py
@@ -14,7 +14,6 @@
 # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 
 
-import cliapp
 import os
 import shutil
 import tarfile
@@ -32,28 +31,14 @@ class FakeSource(object):
         }
 
 
-class FakeApplication(object):
-
-    def __init__(self, cachedir):
-        self.settings = {
-            'cachedir': cachedir,
-        }
-
-    def runcmd(self, *args, **kwargs):
-        cliapp.runcmd(*args, **kwargs)
-
-
 class StagingAreaTests(unittest.TestCase):
 
     def setUp(self):
         self.tempdir = tempfile.mkdtemp()
-        self.cachedir = os.path.join(self.tempdir, 'cachedir')
-        os.mkdir(self.cachedir)
-        os.mkdir(os.path.join(self.cachedir, 'artifacts'))
         self.staging = os.path.join(self.tempdir, 'staging')
         self.created_dirs = []
-        self.sa = morphlib.stagingarea.StagingArea(
-            FakeApplication(self.cachedir), self.staging, self.staging)
+        self.sa = morphlib.stagingarea.StagingArea(object(), self.staging,
+                                                   self.staging)
 
     def tearDown(self):
         shutil.rmtree(self.tempdir)