diff --git a/ChangeLog.txt b/ChangeLog.txt index f16f18b5..8d46284e 100644 --- a/ChangeLog.txt +++ b/ChangeLog.txt @@ -1,5 +1,11 @@ +4.1.5 - 9/9/2022 +Updated: +- Rename config files to .yml +Bugfixed: +- Show version to noarch packages + 4.1.4 - 17/07/2022 --Added +Added: - setup.cfg file - Option to upgrade sbo packages diff --git a/README.rst b/README.rst index ee1a4a94..15fa1d09 100644 --- a/README.rst +++ b/README.rst @@ -30,8 +30,8 @@ Install from the official third-party `SBo repository /dev/null 2>&1 diff --git a/slackbuild/slpkg.SlackBuild b/slackbuild/slpkg.SlackBuild index 50714a1b..9282c559 100755 --- a/slackbuild/slpkg.SlackBuild +++ b/slackbuild/slpkg.SlackBuild @@ -98,8 +98,8 @@ find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | gr # install configuration files mkdir -p $PKG/etc/slpkg -install -D -m0644 configs/slpkg.yaml $PKG/etc/slpkg/slpkg.yaml.new -install -D -m0644 configs/blacklist.yaml $PKG/etc/slpkg/blacklist.yaml.new +install -D -m0644 configs/slpkg.yml $PKG/etc/slpkg/slpkg.yml.new +install -D -m0644 configs/blacklist.yml $PKG/etc/slpkg/blacklist.yml.new mkdir -p $PKG/usr/man/man1 cp man/slpkg.1 $PKG/usr/man/man1 diff --git a/slpkg/blacklist.py b/slpkg/blacklist.py index 3f950fb2..fc74b05f 100644 --- a/slpkg/blacklist.py +++ b/slpkg/blacklist.py @@ -15,7 +15,7 @@ class Blacklist: etc_path: str = Configs.etc_path def get(self): - file = f'{self.etc_path}/blacklist.yaml' + file = f'{self.etc_path}/blacklist.yml' if os.path.isfile(file): with open(file, 'r') as black: return yaml.safe_load(black)['blacklist']['packages'] diff --git a/slpkg/configs.py b/slpkg/configs.py index 0cdb518c..f483c4ba 100644 --- a/slpkg/configs.py +++ b/slpkg/configs.py @@ -53,7 +53,7 @@ class Configs: os.makedirs(build_path) ''' Overwrite with user configuration. ''' - config_file: str = f'{etc_path}/{prog_name}.yaml' + config_file: str = f'{etc_path}/{prog_name}.yml' if os.path.isfile(config_file): with open(config_file, 'r') as conf: configs = yaml.safe_load(conf) diff --git a/slpkg/main.py b/slpkg/main.py index e6af051c..7730df76 100644 --- a/slpkg/main.py +++ b/slpkg/main.py @@ -68,6 +68,10 @@ class Argparse: upgrade = Upgrade() packages = list(upgrade.packages()) + if not packages: + print('\nEverything is up-to-date.\n') + raise SystemExit() + install = Slackbuilds(packages, self.flags, install=True) install.execute() raise SystemExit() diff --git a/slpkg/version.py b/slpkg/version.py index a322d90c..a0932796 100644 --- a/slpkg/version.py +++ b/slpkg/version.py @@ -10,7 +10,7 @@ from slpkg.configs import Configs @dataclass class Version: prog_name: str = Configs.prog_name - version_info: tuple = (4, 1, 4) + version_info: tuple = (4, 1, 5) version: str = '{0}.{1}.{2}'.format(*version_info) license: str = 'MIT License' author: str = 'dslackw' diff --git a/slpkg/views/views.py b/slpkg/views/views.py index f2bfb6d4..4797b7d2 100644 --- a/slpkg/views/views.py +++ b/slpkg/views/views.py @@ -95,6 +95,9 @@ class ViewMessage: if '--reinstall' in self.flags: install, set_color = 'upgrade', color['YELLOW'] + if installed and 'noarch' in installed: + self.arch = 'noarch' + if installed: print(f'[{set_color} {install} {color["ENDC"]}] -> ' f'{sbo}-{version} {set_color}'