diff options
author | wangbiao <biao716.wang@samsung.com> | 2024-06-14 11:33:31 +0900 |
---|---|---|
committer | wangbiao <biao716.wang@samsung.com> | 2024-06-14 11:34:57 +0900 |
commit | fe85eceba347f08bbe7c54d9eb49c4d04596ce44 (patch) | |
tree | 8ebeb3d6118f7ab9b4f9942a83da5214f0aa729e /plugins/backend/zypppkgmgr.py | |
parent | a8444d70571829613c1728babd60e598694a94e6 (diff) | |
download | mic-tizen_9.0.tar.gz mic-tizen_9.0.tar.bz2 mic-tizen_9.0.zip |
Upgrade mic version to 0.28.19 from 'tools/mic' projectupstream/0.28.19tizen_9.0_m2_releaseaccepted/tizen/unified/x/asan/20240625.092728accepted/tizen/unified/x/20240614.160502accepted/tizen/unified/toolchain/20240624.121607accepted/tizen/unified/dev/20240620.010927accepted/tizen/unified/20240614.085211accepted/tizen/9.0/unified/20241030.235948tizen_9.0accepted/tizen_unified_x_asanaccepted/tizen_unified_xaccepted/tizen_unified_toolchainaccepted/tizen_unified_devaccepted/tizen_unifiedaccepted/tizen_9.0_unified
This is requested by VD
Mainly apply this patch: https://review.tizen.org/gerrit/#/c/tools/mic/+/291263/
Change-Id: Ibcc46d27bf89c86b10a2540af284e64681e84c6c
Signed-off-by: wangbiao <biao716.wang@samsung.com>
Diffstat (limited to 'plugins/backend/zypppkgmgr.py')
-rw-r--r-- | plugins/backend/zypppkgmgr.py | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/plugins/backend/zypppkgmgr.py b/plugins/backend/zypppkgmgr.py index afddfd7..950c1af 100644 --- a/plugins/backend/zypppkgmgr.py +++ b/plugins/backend/zypppkgmgr.py @@ -72,6 +72,7 @@ class Zypp(BackendPlugin): self.Z = None self.ts = None self.ts_pre = None + self.pkgs_bak = [] self.incpkgs = {} self.excpkgs = {} self.pre_pkgs = [] @@ -99,7 +100,9 @@ class Zypp(BackendPlugin): if self.ts_pre: self.ts_pre.closeDB() - self.ts = None + self.ts_pre = None + + self.pkgs_bak = [] self.closeRpmDB() @@ -896,13 +899,17 @@ class Zypp(BackendPlugin): msger.verbose("pre-install package added: %s" % pkgname) self.ts_pre.addInstall(h, rpmpath, 'u') - self.ts.addInstall(h, rpmpath, 'u') + #for rpm4.14 vesion, need to split addInstall for these two transactionSet. + #addInstall for self.ts should be after self.ts_pre done. + self.pkgs_bak.append({"header": h, "rpmpath": rpmpath}) unresolved_dependencies = self.ts.check() if not unresolved_dependencies: if self.pre_pkgs: self.preinstallPkgs() + for pkg_bak in self.pkgs_bak: + self.ts.addInstall(pkg_bak["header"], pkg_bak["rpmpath"], 'u') self.ts.order() cb = rpmmisc.RPMInstallCallback(self.ts) installlogfile = "%s/__catched_stderr.buf" % (self.instroot) @@ -915,6 +922,7 @@ class Zypp(BackendPlugin): msger.disable_logstderr() self.ts.closeDB() self.ts = None + self.pkgs_bak = [] if errors is not None: if len(errors) == 0: |