|
@@ -107,10 +107,17 @@ class RpmSdk(Sdk):
|
|
|
pm.dump_all_available_pkgs()
|
|
|
pm.update()
|
|
|
|
|
|
- for pkg_type in self.install_order:
|
|
|
- if pkg_type in pkgs_to_install:
|
|
|
- pm.install(pkgs_to_install[pkg_type],
|
|
|
- [False, True][pkg_type == Manifest.PKG_TYPE_ATTEMPT_ONLY])
|
|
|
+ pkgs = []
|
|
|
+ pkgs_attempt = []
|
|
|
+ for pkg_type in pkgs_to_install:
|
|
|
+ if pkg_type == Manifest.PKG_TYPE_ATTEMPT_ONLY:
|
|
|
+ pkgs_attempt += pkgs_to_install[pkg_type]
|
|
|
+ else:
|
|
|
+ pkgs += pkgs_to_install[pkg_type]
|
|
|
+
|
|
|
+ pm.install(pkgs)
|
|
|
+
|
|
|
+ pm.install(pkgs_attempt, True)
|
|
|
|
|
|
def _populate(self):
|
|
|
bb.note("Installing TARGET packages")
|
|
@@ -184,10 +191,17 @@ class OpkgSdk(Sdk):
|
|
|
|
|
|
pm.update()
|
|
|
|
|
|
- for pkg_type in self.install_order:
|
|
|
- if pkg_type in pkgs_to_install:
|
|
|
- pm.install(pkgs_to_install[pkg_type],
|
|
|
- [False, True][pkg_type == Manifest.PKG_TYPE_ATTEMPT_ONLY])
|
|
|
+ pkgs = []
|
|
|
+ pkgs_attempt = []
|
|
|
+ for pkg_type in pkgs_to_install:
|
|
|
+ if pkg_type == Manifest.PKG_TYPE_ATTEMPT_ONLY:
|
|
|
+ pkgs_attempt += pkgs_to_install[pkg_type]
|
|
|
+ else:
|
|
|
+ pkgs += pkgs_to_install[pkg_type]
|
|
|
+
|
|
|
+ pm.install(pkgs)
|
|
|
+
|
|
|
+ pm.install(pkgs_attempt, True)
|
|
|
|
|
|
def _populate(self):
|
|
|
bb.note("Installing TARGET packages")
|
|
@@ -260,10 +274,17 @@ class DpkgSdk(Sdk):
|
|
|
pm.write_index()
|
|
|
pm.update()
|
|
|
|
|
|
- for pkg_type in self.install_order:
|
|
|
- if pkg_type in pkgs_to_install:
|
|
|
- pm.install(pkgs_to_install[pkg_type],
|
|
|
- [False, True][pkg_type == Manifest.PKG_TYPE_ATTEMPT_ONLY])
|
|
|
+ pkgs = []
|
|
|
+ pkgs_attempt = []
|
|
|
+ for pkg_type in pkgs_to_install:
|
|
|
+ if pkg_type == Manifest.PKG_TYPE_ATTEMPT_ONLY:
|
|
|
+ pkgs_attempt += pkgs_to_install[pkg_type]
|
|
|
+ else:
|
|
|
+ pkgs += pkgs_to_install[pkg_type]
|
|
|
+
|
|
|
+ pm.install(pkgs)
|
|
|
+
|
|
|
+ pm.install(pkgs_attempt, True)
|
|
|
|
|
|
def _populate(self):
|
|
|
bb.note("Installing TARGET packages")
|