Release 0.9.0

make_release.sh

@@ -29,7 +29,7 @@ find . -type f -name '*src.tar.xz' -not -name "*$VERSION-src.tar.xz" -exec rm -f
 
 read -p "Publish release? [Ny] " -n 1 -r
 if [[ $REPLY =~ ^[Yy]$ ]]; then
-  git add package/archlinux/PKGBUILD src/ahriman/version.py
+  git add package/archlinux/PKGBUILD
   git commit -m "Release $VERSION" && git push
   git tag "$VERSION" && git push --tags
 fi

package/archlinux/PKGBUILD

@@ -1,7 +1,7 @@
 # Maintainer: Evgeniy Alekseev
 
 pkgname='ahriman'
-pkgver=0.9.1
+pkgver=0.9.0
 pkgrel=1
 pkgdesc="ArcHlinux ReposItory MANager"
 arch=('any')
@@ -21,7 +21,7 @@ source=("https://github.com/arcan1s/ahriman/releases/download/$pkgver/$pkgname-$
         'ahriman.sudoers'
         'ahriman.sysusers'
         'ahriman.tmpfiles')
-sha512sums=('82a8208554956f009db0334b0cb20891889d96617b4c9b9d2af7a007d668f6cbc6d46d0be8b5ee11ffb2b69d124b5d5d6db1a6f7d5a0a2c719c0d8e07dca24d8'
+sha512sums=('a44af5545204484452ffab2ad1819ad19a4c09f164fd1787dea9cc96474e559f898a6c58f25d70e8e4f505e55ee07b3d3db477a2f412f46e52c252c72bc05f55'
             '8c9b5b63ac3f7b4d9debaf801a1e9c060877c33d3ecafe18010fcca778e5fa2f2e46909d3d0ff1b229ff8aa978445d8243fd36e1fc104117ed678d5e21901167'
             '13718afec2c6786a18f0b223ef8e58dccf0688bca4cdbe203f14071f5031ed20120eb0ce38b52c76cfd6e8b6581a9c9eaa2743eb11abbaca637451a84c33f075'
             '55b20f6da3d66e7bbf2add5d95a3b60632df121717d25a993e56e737d14f51fe063eb6f1b38bd81cc32e05db01c0c1d80aaa720c45cde87f238d8b46cdb8cbc4')

src/ahriman/application/application.py

@@ -44,21 +44,22 @@ class Application:
     def get_updates(self, no_aur: bool, no_manual: bool, no_vcs: bool,
                     log_fn: Callable[[str], None]) -> List[Package]:
         updates = []
+        checked: List[str] = []
 
         if not no_aur:
-            updates.extend(self.repository.updates_aur(no_vcs))
+            updates.extend(self.repository.updates_aur(no_vcs, checked))
         if not no_manual:
-            updates.extend(self.repository.updates_manual())
+            updates.extend(self.repository.updates_manual(checked))
 
         for package in updates:
-            log_fn(f'{package.base} = {package.version}')
+            log_fn(f'{package.name} = {package.version}')
 
         return updates
 
     def add(self, names: List[str]) -> None:
         def add_manual(name: str) -> None:
             package = Package.load(name, self.config.get('aur', 'url'))
-            Task.fetch(os.path.join(self.repository.paths.manual, package.base), package.url)
+            Task.fetch(os.path.join(self.repository.paths.manual, package.name), package.url)
 
         def add_archive(src: str) -> None:
             dst = os.path.join(self.repository.paths.packages, os.path.basename(src))

src/ahriman/core/build_tools/task.py

@@ -46,7 +46,7 @@ class Task:
 
     @property
     def git_path(self) -> str:
-        return os.path.join(self.paths.sources, self.package.base)
+        return os.path.join(self.paths.sources, self.package.name)
 
     @staticmethod
     def fetch(local: str, remote: str) -> None:
@@ -58,17 +58,17 @@ class Task:
         cmd.extend(self.archbuild_flags)
         cmd.extend(['--'] + self.makechrootpkg_flags)
         cmd.extend(['--'] + self.makepkg_flags)
-        self.logger.info(f'using {cmd} for {self.package.base}')
+        self.logger.info(f'using {cmd} for {self.package.name}')
 
         check_output(
             *cmd,
-            exception=BuildFailed(self.package.base),
+            exception=BuildFailed(self.package.name),
             cwd=self.git_path,
             logger=self.build_logger)
 
         # well it is not actually correct, but we can deal with it
         return check_output('makepkg', '--packagelist',
-                            exception=BuildFailed(self.package.base),
+                            exception=BuildFailed(self.package.name),
                             cwd=self.git_path).splitlines()
 
     def clone(self, path: Optional[str] = None) -> None:

src/ahriman/core/repo/repo_wrapper.py

@@ -46,12 +46,13 @@ class RepoWrapper:
             cwd=self.paths.repository,
             logger=self.logger)
 
-    def remove(self, prefix: str, package: str) -> None:
-        for fn in filter(lambda f: f.startswith(prefix), os.listdir(self.paths.repository)):
-            full_path = os.path.join(self.paths.repository, fn)
-            os.remove(full_path)
+    def remove(self, path: str, package: str) -> None:
+        os.remove(path)
+        sign_path = f'{path}.sig'
+        if os.path.exists(sign_path):
+            os.remove(sign_path)
         check_output(
             'repo-remove', *self.sign_args, self.repo_path, package,
-            exception=BuildFailed(package),
+            exception=BuildFailed(path),
             cwd=self.paths.repository,
             logger=self.logger)

src/ahriman/core/report/html.py

@@ -40,7 +40,7 @@ class HTML(Report):
 
         # base template vars
         if SignSettings.from_option(config.get('sign', 'enabled')) != SignSettings.Disabled:
-            self.pgp_key = config.get('sign', 'key', fallback=None)
+            self.pgp_key = config.get('sign', 'key')
         else:
             self.pgp_key = None
         self.homepage = config.get(section, 'homepage', fallback=None)

src/ahriman/core/repository.py

@@ -70,7 +70,9 @@ class Repository:
             full_path = os.path.join(self.paths.repository, fn)
             try:
                 local = Package.load(full_path, self.aur_url)
-                result.setdefault(local.base, local).packages.update(local.packages)
+                if local.name in result:
+                    continue
+                result[local.name] = local
             except Exception:
                 self.logger.exception(f'could not load package from {fn}', exc_info=True)
                 continue
@@ -89,7 +91,7 @@ class Repository:
             try:
                 build_single(package)
             except Exception:
-                self.logger.exception(f'{package.base} ({self.architecture}) build exception', exc_info=True)
+                self.logger.exception(f'{package.name} ({self.architecture}) build exception', exc_info=True)
                 continue
         self._clear_build()
 
@@ -99,21 +101,19 @@ class Repository:
         ]
 
     def process_remove(self, packages: List[str]) -> str:
-        def remove_single(package: str) -> None:
-            try:
-                self.wrapper.remove(package, package)
-            except Exception:
-                self.logger.exception(f'could not remove {package}', exc_info=True)
+        for fn in os.listdir(self.paths.repository):
+            if not package_like(fn):
+                continue
 
-        for local in self.packages():
-            if local.base in packages:
-                to_remove = local.packages
-            elif local.packages.intersection(packages):
-                to_remove = local.packages.intersection(packages)
-            else:
-                to_remove = set()
-            for package in to_remove:
-                remove_single(package)
+            full_path = os.path.join(self.paths.repository, fn)
+            try:
+                local = Package.load(full_path, self.aur_url)
+                if local.name not in packages:
+                    continue
+                self.wrapper.remove(full_path, local.name)
+            except Exception:
+                self.logger.exception(f'could not load package from {fn}', exc_info=True)
+                continue
 
         return self.wrapper.repo_path
 
@@ -141,33 +141,43 @@ class Repository:
 
         return self.wrapper.repo_path
 
-    def updates_aur(self, no_vcs: bool) -> List[Package]:
+    def updates_aur(self, no_vcs: bool, checked: List[str]) -> List[Package]:
         result: List[Package] = []
         ignore_list = self.config.get_list(
             self.config.get_section_name('build', self.architecture), 'ignore_packages')
 
-        for local in self.packages():
-            if local.base in ignore_list:
+        for fn in os.listdir(self.paths.repository):
+            if not package_like(fn):
+                continue
+
+            try:
+                local = Package.load(os.path.join(self.paths.repository, fn), self.aur_url)
+                remote = Package.load(local.name, self.aur_url)
+            except Exception:
+                self.logger.exception(f'could not load package from {fn}', exc_info=True)
+                continue
+            if local.name in checked:
+                continue
+            if local.name in ignore_list:
                 continue
             if local.is_vcs and no_vcs:
                 continue
 
-            try:
-                remote = Package.load(local.base, self.aur_url)
-                if local.is_outdated(remote):
-                    result.append(remote)
-            except Exception:
-                self.logger.exception(f'could not load remote package {local.base}', exc_info=True)
-                continue
+            if local.is_outdated(remote):
+                result.append(remote)
+            checked.append(local.name)
 
         return result
 
-    def updates_manual(self) -> List[Package]:
+    def updates_manual(self, checked: List[str]) -> List[Package]:
         result: List[Package] = []
 
         for fn in os.listdir(self.paths.manual):
             local = Package.load(os.path.join(self.paths.manual, fn), self.aur_url)
+            if local.name in checked:
+                continue
             result.append(local)
+            checked.append(local.name)
         self._clear_manual()
 
         return result

src/ahriman/models/package.py

@@ -26,9 +26,9 @@ import os
 import tempfile
 
 from configparser import RawConfigParser
-from dataclasses import dataclass, field
+from dataclasses import dataclass
 from srcinfo.parse import parse_srcinfo
-from typing import Set, Type
+from typing import Type
 
 from ahriman.core.exceptions import InvalidPackageInfo
 from ahriman.core.util import check_output
@@ -36,19 +36,19 @@ from ahriman.core.util import check_output
 
 @dataclass
 class Package:
-    base: str
+    name: str
     version: str
     url: str
-    packages: Set[str] = field(default_factory=set)
+    remote: bool
 
     @property
     def is_vcs(self) -> bool:
-        return self.base.endswith('-bzr') \
-               or self.base.endswith('-csv')\
-               or self.base.endswith('-darcs')\
-               or self.base.endswith('-git')\
-               or self.base.endswith('-hg')\
-               or self.base.endswith('-svn')
+        return self.name.endswith('-bzr') \
+               or self.name.endswith('-csv')\
+               or self.name.endswith('-darcs')\
+               or self.name.endswith('-git')\
+               or self.name.endswith('-hg')\
+               or self.name.endswith('-svn')
 
     # additional method to handle vcs versions
     def actual_version(self) -> str:
@@ -74,14 +74,13 @@ class Package:
 
     @classmethod
     def from_archive(cls: Type[Package], path: str, aur_url: str) -> Package:
-        package, base, version = check_output('expac', '-p', '%n %e %v', path, exception=None).split()
-        return cls(base, version, f'{aur_url}/{base}.git', packages={package})
+        name, version = check_output('expac', '-p', '%e %v', path, exception=None).split()
+        return cls(name, version, f'{aur_url}/{name}.git', False)
 
     @classmethod
     def from_aur(cls: Type[Package], name: str, aur_url: str)-> Package:
         package = aur.info(name)
-        return cls(package.package_base, package.version, f'{aur_url}/{package.package_base}.git',
-                   packages={package.name})
+        return cls(package.package_base, package.version, f'{aur_url}/{package.package_base}.git', True)
 
     @classmethod
     def from_build(cls: Type[Package], path: str) -> Package:
@@ -92,10 +91,9 @@ class Package:
             src_info, errors = parse_srcinfo(fn.read())
         if errors:
             raise InvalidPackageInfo(errors)
-        packages = set(src_info['packages'].keys())
 
         return cls(src_info['pkgbase'], f'{src_info["pkgver"]}-{src_info["pkgrel"]}',
-                   git_config.get('remote "origin"', 'url'), packages-packages)
+                   git_config.get('remote "origin"', 'url'), False)
 
     @classmethod
     def load(cls: Type[Package], path: str, aur_url: str) -> Package:
@@ -115,4 +113,4 @@ class Package:
     def is_outdated(self, remote: Package) -> bool:
         remote_version = remote.actual_version()  # either normal version or updated VCS
         result = check_output('vercmp', self.version, remote_version, exception=None)
-        return True if int(result) < 0 else False
+        return True if int(result) < 0 else False

src/ahriman/version.py

@@ -17,4 +17,4 @@
 # You should have received a copy of the GNU General Public License
 # along with this program. If not, see <http://www.gnu.org/licenses/>.
 #
-__version__ = '0.9.1'
+__version__ = '0.1.0'