summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexander Kanavin <alexander.kanavin@linux.intel.com>2018-04-03 18:45:21 +0300
committerRichard Purdie <richard.purdie@linuxfoundation.org>2018-04-05 14:49:07 +0100
commitb897982679b4554b20ce2112d65ed6ee366eaf0f (patch)
treee7b9db7ad7effc7393b62a53f223ea8e9a7d92c1
parentae661039394f3e056d02c7e1f1d79511d82cb99b (diff)
downloadpoky-b897982679b4554b20ce2112d65ed6ee366eaf0f.tar.gz
package_manager.py: do not hardcode the task name when referring to log files
This can be do_rootfs or do_populate_sdk, or anything else. (From OE-Core rev: e2e05a327e51339d45b53e0276c287ab314e3385) Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/lib/oe/package_manager.py8
1 files changed, 4 insertions, 4 deletions
diff --git a/meta/lib/oe/package_manager.py b/meta/lib/oe/package_manager.py
index 61df06d4f0..2d8aeba037 100644
--- a/meta/lib/oe/package_manager.py
+++ b/meta/lib/oe/package_manager.py
@@ -392,7 +392,7 @@ class PackageManager(object, metaclass=ABCMeta):
392 output = subprocess.check_output(script_full, stderr=subprocess.STDOUT) 392 output = subprocess.check_output(script_full, stderr=subprocess.STDOUT)
393 if output: bb.note(output.decode("utf-8")) 393 if output: bb.note(output.decode("utf-8"))
394 except subprocess.CalledProcessError as e: 394 except subprocess.CalledProcessError as e:
395 bb.warn("The postinstall intercept hook '%s' failed, details in log.do_rootfs" % script) 395 bb.warn("The postinstall intercept hook '%s' failed, details in %s/log.do_%s" % (script, self.d.getVar('T'), self.d.getVar('BB_CURRENTTASK')))
396 bb.note("Exit code %d. Output:\n%s" % (e.returncode, e.output.decode("utf-8"))) 396 bb.note("Exit code %d. Output:\n%s" % (e.returncode, e.output.decode("utf-8")))
397 self._postpone_to_first_boot(script_full) 397 self._postpone_to_first_boot(script_full)
398 398
@@ -789,7 +789,7 @@ class RpmPM(PackageManager):
789 failed_scriptlets_pkgnames[line.split()[-1]] = True 789 failed_scriptlets_pkgnames[line.split()[-1]] = True
790 790
791 if len(failed_scriptlets_pkgnames) > 0: 791 if len(failed_scriptlets_pkgnames) > 0:
792 failed_postinsts_warn(list(failed_scriptlets_pkgnames.keys()), self.d.expand("${T}/log.do_rootfs")) 792 failed_postinsts_warn(list(failed_scriptlets_pkgnames.keys()), self.d.expand("${T}/log.do_${BB_CURRENTTASK}"))
793 for pkg in failed_scriptlets_pkgnames.keys(): 793 for pkg in failed_scriptlets_pkgnames.keys():
794 self.save_rpmpostinst(pkg) 794 self.save_rpmpostinst(pkg)
795 795
@@ -1265,7 +1265,7 @@ class OpkgPM(OpkgDpkgPM):
1265 bb.warn(line) 1265 bb.warn(line)
1266 failed_pkgs.append(line.split(".")[0]) 1266 failed_pkgs.append(line.split(".")[0])
1267 if failed_pkgs: 1267 if failed_pkgs:
1268 failed_postinsts_warn(failed_pkgs, self.d.expand("${T}/log.do_rootfs")) 1268 failed_postinsts_warn(failed_pkgs, self.d.expand("${T}/log.do_${BB_CURRENTTASK}"))
1269 except subprocess.CalledProcessError as e: 1269 except subprocess.CalledProcessError as e:
1270 (bb.fatal, bb.warn)[attempt_only]("Unable to install packages. " 1270 (bb.fatal, bb.warn)[attempt_only]("Unable to install packages. "
1271 "Command '%s' returned %d:\n%s" % 1271 "Command '%s' returned %d:\n%s" %
@@ -1530,7 +1530,7 @@ class DpkgPM(OpkgDpkgPM):
1530 bb.warn("%s for package %s failed with %d:\n%s" % 1530 bb.warn("%s for package %s failed with %d:\n%s" %
1531 (control_script.name, pkg_name, e.returncode, 1531 (control_script.name, pkg_name, e.returncode,
1532 e.output.decode("utf-8"))) 1532 e.output.decode("utf-8")))
1533 failed_postinsts_warn([pkg_name], self.d.expand("${T}/log.do_rootfs")) 1533 failed_postinsts_warn([pkg_name], self.d.expand("${T}/log.do_${BB_CURRENTTASK}"))
1534 failed_pkgs.append(pkg_name) 1534 failed_pkgs.append(pkg_name)
1535 break 1535 break
1536 1536