From 4e0b7b95627d071538818f17a42498edda4d67ef Mon Sep 17 00:00:00 2001 From: Ricardo Salveti de Araujo Date: Fri, 6 Nov 2009 15:56:04 -0300 Subject: [PATCH 008/118] rootfs_deb.bbclass: removing trailing whitspace Signed-off-by: Ricardo Salveti de Araujo --- classes/rootfs_deb.bbclass | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/classes/rootfs_deb.bbclass b/classes/rootfs_deb.bbclass index dc2b2cb..c7d49f3 100644 --- a/classes/rootfs_deb.bbclass +++ b/classes/rootfs_deb.bbclass @@ -44,7 +44,7 @@ fakeroot rootfs_deb_do_rootfs () { cat "${STAGING_ETCDIR_NATIVE}/apt/apt.conf.sample" \ | sed -e 's#Architecture ".*";#Architecture "${DPKG_ARCH}";#' \ - | sed -e 's#status ".*";#status "${IMAGE_ROOTFS}/var/dpkg/status";#' \ + | sed -e 's#status ".*";#status "${IMAGE_ROOTFS}/var/dpkg/status";#' \ | sed -e 's#DPkg::Options {".*"};#DPkg::Options {"--root=${IMAGE_ROOTFS}";"--admindir=${IMAGE_ROOTFS}/var/dpkg";"--force-all";"--no-debsig"};#' \ > "${STAGING_ETCDIR_NATIVE}/apt/apt-rootfs.conf" @@ -133,7 +133,7 @@ fakeroot rootfs_deb_do_rootfs () { ${ROOTFS_POSTPROCESS_COMMAND} - log_check rootfs + log_check rootfs } rootfs_deb_log_check() { @@ -142,7 +142,7 @@ rootfs_deb_log_check() { lf_txt="`cat $lf_path`" for keyword_die in "E:" - do + do if (echo "$lf_txt" | grep -v log_check | grep "$keyword_die") >/dev/null 2>&1 then echo "log_check: There were error messages in the logfile" @@ -152,7 +152,7 @@ rootfs_deb_log_check() { do_exit=1 fi done - test "$do_exit" = 1 && exit 1 + test "$do_exit" = 1 && exit 1 true } -- 1.6.3.3