Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=02560297926b1866f3e5eff82c68ff4e629560e9
commit 02560297926b1866f3e5eff82c68ff4e629560e9 Author: crazy <[email protected]> Date: Sat Aug 26 16:01:53 2017 +0200 calamares-frugalware-3.1.3-3-x86_64 * added reworked patch for packages modules diff --git a/source/kde5-extra/calamares-frugalware/0001-packages-make-it-work-for-now.patch b/source/kde5-extra/calamares-frugalware/0001-packages-make-it-work-for-now.patch deleted file mode 100644 index dd43866..0000000 --- a/source/kde5-extra/calamares-frugalware/0001-packages-make-it-work-for-now.patch +++ /dev/null @@ -1,34 +0,0 @@ -From 2d74861d9388ba250148b652f9a7edd171902c15 Mon Sep 17 00:00:00 2001 -From: Gabriel Craciunescu <[email protected]> -Date: Sat, 26 Aug 2017 06:49:54 +0200 -Subject: [PATCH] packages: make it work for now only ' - pkgman.install(entry[key]) ' works .. not sure what broke the rest so use - this workaround for now - ---- - src/modules/packages/main.py | 9 ++------- - 1 file changed, 2 insertions(+), 7 deletions(-) - -diff --git a/src/modules/packages/main.py b/src/modules/packages/main.py -index 93fcc9eb7..8a035afe5 100644 ---- a/src/modules/packages/main.py -+++ b/src/modules/packages/main.py -@@ -154,13 +154,8 @@ def run_operations(pkgman, entry): - for key in entry.keys(): - entry[key] = subst_locale(entry[key]) - if key == "install": -- if isinstance(entry[key], list): -- for package in entry[key]: -- pkgman.run(package["pre-script"]) -- pkgman.install([package["package"]]) -- pkgman.run(package["post-script"]) -- else: -- pkgman.install(entry[key]) -+ # not sure what changed but only that work for now -+ pkgman.install(entry[key]) - elif key == "try_install": - # we make a separate package manager call for each package so a - # single failing package won't stop all of them --- -2.14.1 - diff --git a/source/kde5-extra/calamares-frugalware/0001-packages-rework-workaround-patch.patch b/source/kde5-extra/calamares-frugalware/0001-packages-rework-workaround-patch.patch new file mode 100644 index 0000000..e799569 --- /dev/null +++ b/source/kde5-extra/calamares-frugalware/0001-packages-rework-workaround-patch.patch @@ -0,0 +1,46 @@ +From 870eedd0cd7c7295eaaf06bb26e84ecbe2a24f47 Mon Sep 17 00:00:00 2001 +From: Gabriel Craciunescu <[email protected]> +Date: Sat, 26 Aug 2017 15:51:16 +0200 +Subject: [PATCH] packages: rework workaround patch + +- also while at it added command to wipe the package cache too +- also added --noprogressbar and --nointegrity to pacman ARGS +--- + src/modules/packages/main.py | 14 +++++--------- + 1 file changed, 5 insertions(+), 9 deletions(-) + +diff --git a/src/modules/packages/main.py b/src/modules/packages/main.py +index 93fcc9eb7..27b5afd6f 100644 +--- a/src/modules/packages/main.py ++++ b/src/modules/packages/main.py +@@ -67,8 +67,9 @@ class PackageManager: + else: + pacman_flags = "-Sy" + +- check_target_env_call(["pacman", pacman_flags, +- "--noconfirm"] + pkgs) ++ check_target_env_call(["pacman", pacman_flags, "--noconfirm", ++ "--noprogressbar", "--nointegrity"] + pkgs) ++ ckeck_target_env_call(["pacman", "-Scc", "--noconfirm"]) + elif self.backend == "portage": + check_target_env_call(["emerge", "-v"] + pkgs) + elif self.backend == "entropy": +@@ -154,13 +155,8 @@ def run_operations(pkgman, entry): + for key in entry.keys(): + entry[key] = subst_locale(entry[key]) + if key == "install": +- if isinstance(entry[key], list): +- for package in entry[key]: +- pkgman.run(package["pre-script"]) +- pkgman.install([package["package"]]) +- pkgman.run(package["post-script"]) +- else: +- pkgman.install(entry[key]) ++ # not sure what changed but only that work for now ++ pkgman.install(entry[key]) + elif key == "try_install": + # we make a separate package manager call for each package so a + # single failing package won't stop all of them +-- +2.14.1 + diff --git a/source/kde5-extra/calamares-frugalware/FrugalBuild b/source/kde5-extra/calamares-frugalware/FrugalBuild index 251768c..f0d25c4 100644 --- a/source/kde5-extra/calamares-frugalware/FrugalBuild +++ b/source/kde5-extra/calamares-frugalware/FrugalBuild @@ -3,7 +3,7 @@ pkgname=calamares-frugalware pkgver=3.1.3 -pkgrel=2 +pkgrel=3 pkgdesc="Distribution-independent installer framework" archs=("x86_64") groups=('kde5-extra') @@ -13,7 +13,7 @@ _F_kde_defaults=0 Finclude kf5 github source+=(calamares-locale.service \ calamares-locale-setup \ - 0001-packages-make-it-work-for-now.patch \ + 0001-packages-rework-workaround-patch.patch \ calamares-frugalware.desktop \ calamares-frugalware.svg 49-nopasswd_calamares.rules) depends=('kpmcore>=3.1.2' 'qt5-webengine>=5.9.1' 'pyqt5-python3>=5.9' 'libboost' \ @@ -26,7 +26,7 @@ _F_cd_path="calamares-$pkgver" sha1sums=('7cf6eaff31538e3ea91d49a69ef96dee172e5739' \ 'a496ee65a14fad4c96fe2a51d59f5769a9286411' \ 'abd9098e0b3f988182a4b0f3173bffb9f0f7c215' \ - 'bdf697b9da2f3d5b24d8dd6dfa942303639f4782' \ + '1061be3d939acf55d7737aea9e8c58c6dd8a9db0' \ '10a6590d410507c48ed84876ff2ebd380c793034' \ '134ca1a53f3b628ba459ec450e84ea0b4f0c11f2' \ '02e4c49a4ff57712ffa94dbb79abc1dd701692c7') _______________________________________________ Frugalware-git mailing list [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
