Get rid of remove_binary_dir.py as the binary/ dir is now created in a temp directory that is always removed when the script exits.

3 files changed, 0 insertions, 30 deletions

diff --git a/linaro-media-create b/linaro-media-create
index d53b47f..22f8ab7 100755
--- a/linaro-media-create
+++ b/linaro-media-create
@@ -19,7 +19,6 @@ from linaro_media_create.partitions import (
     setup_partitions,
     )
 from linaro_media_create.populate_boot import populate_boot
-from linaro_media_create.remove_binary_dir import remove_dir
 from linaro_media_create.rootfs import populate_rootfs
 from linaro_media_create.unpack_binary_tarball import unpack_binary_tarball
 from linaro_media_create import get_args_parser
@@ -85,8 +84,6 @@ if __name__ == '__main__':
         # All good, move on.
         pass
 
-    # TODO: Combine these two into a single function.
-    remove_dir(ROOTFS_DIR)
     unpack_binary_tarball(args.binary, TMP_DIR)
 
     hwpacks = args.hwpacks
diff --git a/linaro_media_create/remove_binary_dir.py b/linaro_media_create/remove_binary_dir.py
deleted file mode 100644
index c2b1438..0000000
--- a/linaro_media_create/remove_binary_dir.py
+++ /dev/null
@@ -1,11 +0,0 @@
-import os.path
-
-from linaro_media_create import cmd_runner
-
-
-def remove_dir(directory, as_root=True):
-    if os.path.exists(directory):
-        proc = cmd_runner.run(['rm', '-rf', directory], as_root=as_root)
-        proc.wait()
-        return proc.returncode
-    return 0
diff --git a/linaro_media_create/tests/test_media_create.py b/linaro_media_create/tests/test_media_create.py
index 1266ad4..6224120 100644
--- a/linaro_media_create/tests/test_media_create.py
+++ b/linaro_media_create/tests/test_media_create.py
@@ -49,7 +49,6 @@ from linaro_media_create.partitions import (
     run_sfdisk_commands,
     setup_partitions,
     )
-from linaro_media_create.remove_binary_dir import remove_dir
 from linaro_media_create.rootfs import (
     create_flash_kernel_config,
     has_space_left_for_swap,
@@ -153,21 +152,6 @@ class TestGetBootCmd(TestCase):
         self.assertEqual(expected, boot_cmd)
 
 
-class TestRemoveBinaryDir(TestCaseWithFixtures):
-
-    def setUp(self):
-        super(TestRemoveBinaryDir, self).setUp()
-        self.temp_dir_fixture = CreateTempDirFixture()
-        self.useFixture(self.temp_dir_fixture)
-
-    def test_remove_dir(self):
-        rc = remove_dir(
-            self.temp_dir_fixture.get_temp_dir(), as_root=False)
-        self.assertEqual(rc, 0)
-        self.assertFalse(
-            os.path.exists(self.temp_dir_fixture.get_temp_dir()))
-
-
 class TestUnpackBinaryTarball(TestCaseWithFixtures):
 
     def setUp(self):