diff --git a/slpkg/binary/install.py b/slpkg/binary/install.py index a48d311f..22d95b46 100644 --- a/slpkg/binary/install.py +++ b/slpkg/binary/install.py @@ -27,13 +27,13 @@ import os from slpkg.utils import Utils from slpkg.sizes import units from slpkg.messages import Msg -from slpkg.remove import delete from slpkg.toolbar import status from slpkg.checksum import check_md5 from slpkg.blacklist import BlackList from slpkg.downloader import Download from slpkg.log_deps import write_deps from slpkg.grep_md5 import pkg_checksum +from slpkg.remove import remove_package from slpkg.splitting import split_package from slpkg.__metadata__ import MetaData as _meta_ @@ -130,7 +130,7 @@ class BinaryInstall(object): ins, upg = self.install_packages() self.msg.reference(ins, upg) write_deps(self.deps_dict) - delete(self.tmp_path, self.install) + remove_package(self.tmp_path, self.install) else: self.msg.not_found(self.if_upgrade) except KeyboardInterrupt: diff --git a/slpkg/remove.py b/slpkg/remove.py index 9d0dd759..b238dd70 100644 --- a/slpkg/remove.py +++ b/slpkg/remove.py @@ -27,7 +27,7 @@ import os from slpkg.__metadata__ import MetaData as _meta_ -def delete(path, packages): +def remove_package(path, packages): """ Remove downloaded packages """ diff --git a/slpkg/slack/patches.py b/slpkg/slack/patches.py index 8382e9c1..06db77b0 100644 --- a/slpkg/slack/patches.py +++ b/slpkg/slack/patches.py @@ -30,11 +30,11 @@ from slpkg.utils import Utils from slpkg.sizes import units from slpkg.messages import Msg from slpkg.url_read import URL -from slpkg.remove import delete from slpkg.toolbar import status from slpkg.checksum import check_md5 from slpkg.blacklist import BlackList from slpkg.downloader import Download +from slpkg.remove import remove_package from slpkg.grep_md5 import pkg_checksum from slpkg.splitting import split_package from slpkg.__metadata__ import MetaData as _meta_ @@ -120,7 +120,7 @@ class Patches(object): if self.meta.slackpkg_log in ["on", "ON"]: self.slackpkg_update() self.msg.reference(self.installed, self.upgraded) - delete(self.patch_path, self.upgrade_all) + remove_package(self.patch_path, self.upgrade_all) else: slack_arch = "" if self.meta.arch == "x86_64":