Release 0.11.2

package/archlinux/PKGBUILD

@@ -1,7 +1,7 @@
 # Maintainer: Evgeniy Alekseev
 
 pkgname='ahriman'
-pkgver=0.11.0
+pkgver=0.11.2
 pkgrel=1
 pkgdesc="ArcHlinux ReposItory MANager"
 arch=('any')
@@ -23,7 +23,7 @@ optdepends=('aws-cli: sync to s3'
 source=("https://github.com/arcan1s/ahriman/releases/download/$pkgver/$pkgname-$pkgver-src.tar.xz"
         'ahriman.sysusers'
         'ahriman.tmpfiles')
-sha512sums=('02a586de3253908022ec0d8329d217dc52c922ab091d3c6ed91bb45fbc521de08f9163c17dfb7589422f43e7114b0b3dd6d35357c4cd82e564251a0f7f908d18'
+sha512sums=('20348a0cf94893a461c0e5ca30da5e48821d276983fcb5ea92245e3e98bcc505cb0ba23ba08b827e2fbd717d807dd269de175536f26eddd6ae152f9aa0b418b7'
             '13718afec2c6786a18f0b223ef8e58dccf0688bca4cdbe203f14071f5031ed20120eb0ce38b52c76cfd6e8b6581a9c9eaa2743eb11abbaca637451a84c33f075'
             '55b20f6da3d66e7bbf2add5d95a3b60632df121717d25a993e56e737d14f51fe063eb6f1b38bd81cc32e05db01c0c1d80aaa720c45cde87f238d8b46cdb8cbc4')
 backup=('etc/ahriman.ini'

src/ahriman/application/application.py

@@ -114,13 +114,18 @@ class Application:
         self.repository.process_sync(targets)
 
     def update(self, updates: Iterable[Package]) -> None:
-        def process_single(portion: Iterable[Package]):
+        def process_update(paths: Iterable[str]) -> None:
-            packages = self.repository.process_build(portion)
+            self.repository.process_update(paths)
-            self.repository.process_update(packages)
             self._finalize()
 
+        # process built packages
+        packages = self.repository.packages_built()
+        process_update(packages)
+
+        # process manual packages
         tree = Tree()
         tree.load(updates)
         for num, level in enumerate(tree.levels()):
             self.logger.info(f'processing level #{num} {[package.base for package in level]}')
-            process_single(level)
+            packages = self.repository.process_build(level)
+            process_update(packages)

src/ahriman/core/repository.py

@@ -63,8 +63,8 @@ class Repository:
             shutil.rmtree(os.path.join(self.paths.manual, package))
 
     def _clear_packages(self) -> None:
-        for package in os.listdir(self.paths.packages):
+        for package in self.packages_built():
-            os.remove(os.path.join(self.paths.packages, package))
+            os.remove(package)
 
     def packages(self) -> List[Package]:
         result: Dict[str, Package] = {}
@@ -80,6 +80,12 @@ class Repository:
                 continue
         return list(result.values())
 
+    def packages_built(self) -> List[str]:
+        return [
+            os.path.join(self.paths.packages, fn)
+            for fn in os.listdir(self.paths.packages)
+        ]
+
     def process_build(self, updates: Iterable[Package]) -> List[str]:
         def build_single(package: Package) -> None:
             self.web.set_building(package.base)
@@ -99,10 +105,7 @@ class Repository:
                 continue
         self._clear_build()
 
-        return [
+        return self.packages_built()
-            os.path.join(self.paths.packages, fn)
-            for fn in os.listdir(self.paths.packages)
-        ]
 
     def process_remove(self, packages: Iterable[str]) -> str:
         def remove_single(package: str) -> None:

src/ahriman/models/package.py

@@ -68,7 +68,7 @@ class Package:
         try:
             Task.fetch(clone_dir, self.git_url)
             # update pkgver first
-            check_output('makepkg', '--nodeps', '--noprepare', '--nobuild',
+            check_output('makepkg', '--nodeps', '--nobuild',
                          exception=None, cwd=clone_dir)
             # generate new .SRCINFO and put it to parser
             src_info_source = check_output('makepkg', '--printsrcinfo',

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.11.0'
+__version__ = '0.11.2'