From 069a332d1cf0778831673ed4ab5dfadbe2758783 Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Sun, 3 Feb 2013 22:10:21 +0000 Subject: classes: Drop none package specific packaging variable accesses (From OE-Core rev: 24cbe88429ba021d7c461e0271b67106d11d5eb2) Signed-off-by: Richard Purdie --- meta/classes/update-rc.d.bbclass | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'meta/classes/update-rc.d.bbclass') diff --git a/meta/classes/update-rc.d.bbclass b/meta/classes/update-rc.d.bbclass index 51ad8b1ae9..65bf022e49 100644 --- a/meta/classes/update-rc.d.bbclass +++ b/meta/classes/update-rc.d.bbclass @@ -57,19 +57,19 @@ python populate_packages_updatercd () { execute on the target. Not doing so may cause update_rc.d postinst invoked twice to cause unwanted warnings. """ - postinst = d.getVar('pkg_postinst_%s' % pkg, True) or d.getVar('pkg_postinst', True) + postinst = d.getVar('pkg_postinst_%s' % pkg, True) if not postinst: postinst = '#!/bin/sh\n' postinst += d.getVar('updatercd_postinst', True) d.setVar('pkg_postinst_%s' % pkg, postinst) - prerm = d.getVar('pkg_prerm_%s' % pkg, True) or d.getVar('pkg_prerm', True) + prerm = d.getVar('pkg_prerm_%s' % pkg, True) if not prerm: prerm = '#!/bin/sh\n' prerm += d.getVar('updatercd_prerm', True) d.setVar('pkg_prerm_%s' % pkg, prerm) - postrm = d.getVar('pkg_postrm_%s' % pkg, True) or d.getVar('pkg_postrm', True) + postrm = d.getVar('pkg_postrm_%s' % pkg, True) if not postrm: postrm = '#!/bin/sh\n' postrm += d.getVar('updatercd_postrm', True) -- cgit 1.2.3-korg