From f6e25c242bd4623c452c7d034cd12aa47fee8953 Mon Sep 17 00:00:00 2001 From: Christian Breunig Date: Mon, 21 Jul 2025 21:04:59 +0200 Subject: vyos.utils: T7648: only provide one chown function Remove duplicate function definition vyos.utils.file.chown which was also provided by vyos.utils.permission.chown. --- src/conf_mode/service_dhcp-server.py | 2 +- src/conf_mode/service_dhcpv6-server.py | 2 +- src/conf_mode/system_login.py | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) (limited to 'src') diff --git a/src/conf_mode/service_dhcp-server.py b/src/conf_mode/service_dhcp-server.py index 6bbe72e90..b404b1708 100755 --- a/src/conf_mode/service_dhcp-server.py +++ b/src/conf_mode/service_dhcp-server.py @@ -29,9 +29,9 @@ from vyos.template import render from vyos.utils.dict import dict_search from vyos.utils.dict import dict_search_args from vyos.utils.file import chmod_775 -from vyos.utils.file import chown from vyos.utils.file import makedir from vyos.utils.file import write_file +from vyos.utils.permission import chown from vyos.utils.process import call from vyos.utils.network import interface_exists from vyos.utils.network import is_subnet_connected diff --git a/src/conf_mode/service_dhcpv6-server.py b/src/conf_mode/service_dhcpv6-server.py index 07dd08337..8344f99b4 100755 --- a/src/conf_mode/service_dhcpv6-server.py +++ b/src/conf_mode/service_dhcpv6-server.py @@ -25,11 +25,11 @@ from vyos.config import Config from vyos.template import render from vyos.utils.process import call from vyos.utils.file import chmod_775 -from vyos.utils.file import chown from vyos.utils.file import makedir from vyos.utils.file import write_file from vyos.utils.dict import dict_search from vyos.utils.network import is_subnet_connected +from vyos.utils.permission import chown from vyos import ConfigError from vyos import airbag airbag.enable() diff --git a/src/conf_mode/system_login.py b/src/conf_mode/system_login.py index 00cacccd1..234b24770 100755 --- a/src/conf_mode/system_login.py +++ b/src/conf_mode/system_login.py @@ -37,7 +37,7 @@ from vyos.utils.auth import get_current_user from vyos.utils.configfs import delete_cli_node from vyos.utils.configfs import add_cli_node from vyos.utils.dict import dict_search -from vyos.utils.file import chown +from vyos.utils.permission import chown from vyos.utils.process import cmd from vyos.utils.process import call from vyos.utils.process import run -- cgit v1.2.3