diff options
| -rw-r--r-- | python/vyos/util.py | 20 | ||||
| -rwxr-xr-x | src/conf_mode/vpn_ipsec.py | 1 | ||||
| -rw-r--r-- | src/tests/test_util.py | 7 |
3 files changed, 0 insertions, 28 deletions
diff --git a/python/vyos/util.py b/python/vyos/util.py index 65c9c2f45..586c79fff 100644 --- a/python/vyos/util.py +++ b/python/vyos/util.py @@ -221,26 +221,6 @@ def write_file(fname, data, defaultonfailure=None, user=None, group=None): return defaultonfailure raise e -def copy_file(source, destination, mkdstdir=False, user=None, group=None): - """ - Copy file from source to destination. Can optionally create the destination - dir if it does not exist. Can optionally change the dir and file ownership. - """ - import shutil - if mkdstdir: - dirname = os.path.dirname(destination) - if not os.path.isdir(dirname): - makedir(dirname, user, group) - try: - filename = os.path.basename(source) - if not destination.endswith('/'): - destination + '/' - shutil.copyfile(source, destination + filename) - except shutil.SameFileError: - # We don't care if we copy the same file again - pass - chown(destination, user, group) - def read_json(fname, defaultonfailure=None): """ read and json decode the content of a file diff --git a/src/conf_mode/vpn_ipsec.py b/src/conf_mode/vpn_ipsec.py index 70b4c52e6..bf4aa332a 100755 --- a/src/conf_mode/vpn_ipsec.py +++ b/src/conf_mode/vpn_ipsec.py @@ -35,7 +35,6 @@ from vyos.util import dict_search from vyos.util import process_named_running from vyos.util import run from vyos.util import cidr_fit -from vyos.util import copy_file from vyos import ConfigError from vyos import airbag airbag.enable() diff --git a/src/tests/test_util.py b/src/tests/test_util.py index 1efd4868f..9bd27adc0 100644 --- a/src/tests/test_util.py +++ b/src/tests/test_util.py @@ -23,10 +23,3 @@ class TestVyOSUtil(TestCase): expected_data = {"foo_bar": {"baz_quux": None}} new_data = mangle_dict_keys(data, '-', '_') self.assertEqual(new_data, expected_data) - - def test_copy_file(self): - source = '/proc/cmdline' - destination = '/tmp/foo/cmdline' - copy_file(source, destination, True) - self.assertEqual(read_file(source), read_file(destination)) - |