[OE-core] meta/classes: Various python whitespace fixes
Richard Purdie
richard.purdie at linuxfoundation.org
Mon Aug 20 21:04:00 UTC 2012
On Mon, 2012-08-20 at 20:18 +0200, Martin Jansa wrote:
> On Mon, Aug 20, 2012 at 05:58:25PM +0100, Richard Purdie wrote:
> > It was pointed out we have a number of weird indentations in the python functions. This patch
> > cleans up 3, 7 and other weird indentations for the core bbclass files.
> >
> > Signed-off-by: Richard Purdie <richard.purdie at linuxfoundation.org>
> > ---
> > diff --git a/meta/classes/base.bbclass b/meta/classes/base.bbclass
> > index 84dcb47..6021ce0 100644
> > --- a/meta/classes/base.bbclass
> > +++ b/meta/classes/base.bbclass
> > @@ -205,8 +205,8 @@ def preferred_ml_updates(d):
> > continue
> > virt = ""
> > if pkg.startswith("virtual/"):
> > - pkg = pkg.replace("virtual/", "")
> > - virt = "virtual/"
> > + pkg = pkg.replace("virtual/", "")
> > + virt = "virtual/"
> > for p in prefixes:
> > newname = "PREFERRED_PROVIDER_" + virt + p + "-" + pkg
> > if pkg != "kernel":
> > @@ -353,13 +353,13 @@ python () {
> > appends = bb.utils.explode_deps(d.expand(" ".join(appends)))
> > newappends = []
> > for a in appends:
> > - if a.endswith("-native") or a.endswith("-cross"):
> > - newappends.append(a)
> > - elif a.startswith("virtual/"):
> > - subs = a.split("/", 1)[1]
> > - newappends.append("virtual/" + prefix + subs + extension)
> > - else:
> > - newappends.append(prefix + a + extension)
> > + if a.endswith("-native") or a.endswith("-cross"):
> > + newappends.append(a)
> > + elif a.startswith("virtual/"):
> > + subs = a.split("/", 1)[1]
> > + newappends.append("virtual/" + prefix + subs + extension)
> > + else:
> > + newappends.append(prefix + a + extension)
> > return newappends
> >
> > def appendVar(varname, appends):
> > diff --git a/meta/classes/bugzilla.bbclass b/meta/classes/bugzilla.bbclass
> > index 6806dcd..006763d 100644
> > --- a/meta/classes/bugzilla.bbclass
> > +++ b/meta/classes/bugzilla.bbclass
> > @@ -105,8 +105,8 @@ python bugzilla_eventhandler() {
> > data = e.data
> > name = bb.event.getName(event)
> > if name == "MsgNote":
> > - # avoid recursion
> > - return
> > + # avoid recursion
> > + return
> >
> > if name == "TaskFailed":
> > xmlrpc = data.getVar("BUGZILLA_XMLRPC", True)
> > diff --git a/meta/classes/buildstats.bbclass b/meta/classes/buildstats.bbclass
> > index dc9afb1..6fd13a8 100644
> > --- a/meta/classes/buildstats.bbclass
> > +++ b/meta/classes/buildstats.bbclass
> > @@ -65,7 +65,7 @@ def set_device(e):
> > try:
> > for line in open("/proc/diskstats", "r"):
> > if majordev == int(line.split()[0]) and minordev == int(line.split()[1]):
> > - rdev=line.split()[2]
> > + rdev=line.split()[2]
> > except:
> > pass
> > file = open(e.data.getVar('DEVFILE', True), "w")
> > @@ -100,10 +100,10 @@ def get_diskdata(var, dev, data):
> > olddiskdata = data.getVar(var, False)
> > diskdata = {}
> > if olddiskdata is None:
> > - return
> > + return
> > newdiskdata = get_diskstats(dev)
> > for key in olddiskdata.iterkeys():
> > - diskdata["Start"+key] = str(int(olddiskdata[key]))
> > + diskdata["Start"+key] = str(int(olddiskdata[key]))
> > diskdata["End"+key] = str(int(newdiskdata[key]))
> > return diskdata
> >
> > diff --git a/meta/classes/grub-efi.bbclass b/meta/classes/grub-efi.bbclass
> > index 147accc..a093628 100644
> > --- a/meta/classes/grub-efi.bbclass
> > +++ b/meta/classes/grub-efi.bbclass
> > @@ -54,12 +54,12 @@ python build_grub_cfg() {
> > if not workdir:
> > bb.error("WORKDIR not defined, unable to package")
> > return
> > -
> > +
> > labels = d.getVar('LABELS', True)
> > if not labels:
> > bb.debug(1, "LABELS not defined, nothing to do")
> > return
> > -
> > +
> > if labels == []:
> > bb.debug(1, "No labels, nothing to do")
> > return
> > @@ -109,7 +109,7 @@ python build_grub_cfg() {
> > if append:
> > cfgfile.write('%s' % (append))
> > cfgfile.write('\n')
> > -
> > +
> > if initrd:
> > cfgfile.write('initrd /initrd')
> > cfgfile.write('\n}\n')
> > diff --git a/meta/classes/image-swab.bbclass b/meta/classes/image-swab.bbclass
> > index 0414653..37d7535 100644
> > --- a/meta/classes/image-swab.bbclass
> > +++ b/meta/classes/image-swab.bbclass
> > @@ -51,13 +51,13 @@ python() {
> > # and cross packages which aren't swabber-native or one of its dependencies
> > # I have ignored them for now...
> > if not bb.data.inherits_class('native', d) and not bb.data.inherits_class('nativesdk', d) and not bb.data.inherits_class('cross', d):
> > - deps = (d.getVarFlag('do_setscene', 'depends') or "").split()
> > - deps.append('strace-native:do_populate_sysroot')
> > - d.setVarFlag('do_setscene', 'depends', " ".join(deps))
> > - logdir = d.expand("${TRACE_LOGDIR}")
> > - bb.utils.mkdirhier(logdir)
> > + deps = (d.getVarFlag('do_setscene', 'depends') or "").split()
> > + deps.append('strace-native:do_populate_sysroot')
> > + d.setVarFlag('do_setscene', 'depends', " ".join(deps))
> > + logdir = d.expand("${TRACE_LOGDIR}")
> > + bb.utils.mkdirhier(logdir)
> > else:
> > - d.setVar('STRACEFUNC', '')
> > + d.setVar('STRACEFUNC', '')
> > }
> >
> > STRACEPID = "${@os.getpid()}"
> > @@ -76,23 +76,23 @@ imageswab_attachstrace () {
> >
> > do_generate_swabber_report () {
> >
> > - update_distro ${HOST_DATA}
> > + update_distro ${HOST_DATA}
> >
> > - # Swabber can't create the directory for us
> > - mkdir -p ${SWABBER_REPORT}
> > + # Swabber can't create the directory for us
> > + mkdir -p ${SWABBER_REPORT}
> >
> > - REPORTSTAMP=${SWAB_ORIG_TASK}-`date +%2m%2d%2H%2M%Y`
> > + REPORTSTAMP=${SWAB_ORIG_TASK}-`date +%2m%2d%2H%2M%Y`
> >
> > - if [ `which ccache` ] ; then
> > - CCACHE_DIR=`( ccache -s | grep "cache directory" | grep -o '[^ ]*$' 2> /dev/null )`
> > - fi
> > + if [ `which ccache` ] ; then
> > + CCACHE_DIR=`( ccache -s | grep "cache directory" | grep -o '[^ ]*$' 2> /dev/null )`
> > + fi
> >
> > - if [ "$(ls -A ${HOST_DATA})" ]; then
> > - echo "Generating swabber report"
> > - swabber -d ${HOST_DATA} -l ${SWABBER_LOGS} -o ${SWABBER_REPORT}/report-${REPORTSTAMP}.txt -r ${SWABBER_REPORT}/extra_report-${REPORTSTAMP}.txt -c all -p ${TOPDIR} -f ${OEROOT}/meta/conf/swabber ${TOPDIR} ${OEROOT} ${CCACHE_DIR}
> > - else
> > - echo "No host data, cannot generate swabber report."
> > - fi
> > + if [ "$(ls -A ${HOST_DATA})" ]; then
> > + echo "Generating swabber report"
> > + swabber -d ${HOST_DATA} -l ${SWABBER_LOGS} -o ${SWABBER_REPORT}/report-${REPORTSTAMP}.txt -r ${SWABBER_REPORT}/extra_report-${REPORTSTAMP}.txt -c all -p ${TOPDIR} -f ${OEROOT}/meta/conf/swabber ${TOPDIR} ${OEROOT} ${CCACHE_DIR}
> > + else
> > + echo "No host data, cannot generate swabber report."
> > + fi
> > }
> > addtask generate_swabber_report after do_${SWAB_ORIG_TASK}
> > do_generate_swabber_report[depends] = "swabber-native:do_populate_sysroot"
> > diff --git a/meta/classes/insane.bbclass b/meta/classes/insane.bbclass
> > index 556a176..0f3f1cd 100644
> > --- a/meta/classes/insane.bbclass
> > +++ b/meta/classes/insane.bbclass
> > @@ -109,7 +109,7 @@ def package_qa_get_machine_dict():
> > "linux-gnux32" : {
> > "x86_64": (62, 0, 0, True, 32),
> > },
> > - }
> > + }
> >
> >
> > # Currently not being used by default "desktop"
> > @@ -719,19 +719,19 @@ Rerun configure task after fixing this. The path was '%s'""" % root)
> >
> > cnf = d.getVar('EXTRA_OECONF', True) or ""
> > if "gettext" not in d.getVar('P', True) and "gcc-runtime" not in d.getVar('P', True) and "--disable-nls" not in cnf:
> > - ml = d.getVar("MLPREFIX", True) or ""
> > - if bb.data.inherits_class('native', d) or bb.data.inherits_class('cross', d) or bb.data.inherits_class('crosssdk', d) or bb.data.inherits_class('nativesdk', d):
> > - gt = "gettext-native"
> > - elif bb.data.inherits_class('cross-canadian', d):
> > - gt = "gettext-nativesdk"
> > - else:
> > - gt = "virtual/" + ml + "gettext"
> > - deps = bb.utils.explode_deps(d.getVar('DEPENDS', True) or "")
> > - if gt not in deps:
> > - for config in configs:
> > - gnu = "grep \"^[[:space:]]*AM_GNU_GETTEXT\" %s >/dev/null" % config
> > - if subprocess.call(gnu, shell=True) == 0:
> > - bb.fatal("""%s required but not in DEPENDS for file %s.
> > + ml = d.getVar("MLPREFIX", True) or ""
> > + if bb.data.inherits_class('native', d) or bb.data.inherits_class('cross', d) or bb.data.inherits_class('crosssdk', d) or bb.data.inherits_class('nativesdk', d):
> > + gt = "gettext-native"
> > + elif bb.data.inherits_class('cross-canadian', d):
> > + gt = "gettext-nativesdk"
> > + else:
> > + gt = "virtual/" + ml + "gettext"
> > + deps = bb.utils.explode_deps(d.getVar('DEPENDS', True) or "")
> > + if gt not in deps:
> > + for config in configs:
> > + gnu = "grep \"^[[:space:]]*AM_GNU_GETTEXT\" %s >/dev/null" % config
> > + if subprocess.call(gnu, shell=True) == 0:
> > + bb.fatal("""%s required but not in DEPENDS for file %s.
> > Missing inherit gettext?""" % (gt, config))
> >
> > if not package_qa_check_license(workdir, d):
> > diff --git a/meta/classes/package.bbclass b/meta/classes/package.bbclass
> > index 278f0f0..b17fa08 100644
> > --- a/meta/classes/package.bbclass
> > +++ b/meta/classes/package.bbclass
> > @@ -230,42 +230,42 @@ def splitfile2(debugsrcdir, d):
> >
> > sourcefile = d.expand("${WORKDIR}/debugsources.list")
> > if debugsrcdir and os.path.isfile(sourcefile):
> > - dvar = d.getVar('PKGD', True)
> > - pathprefix = "export PATH=%s; " % d.getVar('PATH', True)
> > - strip = d.getVar("STRIP", True)
> > - objcopy = d.getVar("OBJCOPY", True)
> > - debugedit = d.expand("${STAGING_LIBDIR_NATIVE}/rpm/bin/debugedit")
> > - workdir = d.getVar("WORKDIR", True)
> > - workparentdir = os.path.dirname(workdir)
> > - workbasedir = os.path.basename(workdir)
> > -
> > - nosuchdir = []
> > - basepath = dvar
> > - for p in debugsrcdir.split("/"):
> > - basepath = basepath + "/" + p
> > - if not os.path.exists(basepath):
> > - nosuchdir.append(basepath)
> > - bb.mkdirhier(basepath)
> > -
> > - processdebugsrc = "LC_ALL=C ; sort -z -u '%s' | egrep -v -z '(<internal>|<built-in>)$' | "
> > - # We need to ignore files that are not actually ours
> > - # we do this by only paying attention to items from this package
> > - processdebugsrc += "fgrep -z '%s' | "
> > - processdebugsrc += "(cd '%s' ; cpio -pd0mL --no-preserve-owner '%s%s' 2>/dev/null)"
> > -
> > - subprocess.call(processdebugsrc % (sourcefile, workbasedir, workparentdir, dvar, debugsrcdir), shell=True)
> > -
> > - # The copy by cpio may have resulted in some empty directories! Remove these
> > - for root, dirs, files in os.walk("%s%s" % (dvar, debugsrcdir)):
> > - for d in dirs:
> > - dir = os.path.join(root, d)
> > - #bb.note("rmdir -p %s" % dir)
> > - subprocess.call("rmdir -p %s 2>/dev/null" % dir, shell=True)
> > -
> > - # Also remove debugsrcdir if its empty
> > - for p in nosuchdir[::-1]:
> > - if os.path.exists(p) and not os.listdir(p):
> > - os.rmdir(p)
> > + dvar = d.getVar('PKGD', True)
> > + pathprefix = "export PATH=%s; " % d.getVar('PATH', True)
> > + strip = d.getVar("STRIP", True)
> > + objcopy = d.getVar("OBJCOPY", True)
> > + debugedit = d.expand("${STAGING_LIBDIR_NATIVE}/rpm/bin/debugedit")
> > + workdir = d.getVar("WORKDIR", True)
> > + workparentdir = os.path.dirname(workdir)
> > + workbasedir = os.path.basename(workdir)
> > +
> > + nosuchdir = []
> > + basepath = dvar
> > + for p in debugsrcdir.split("/"):
> > + basepath = basepath + "/" + p
> > + if not os.path.exists(basepath):
> > + nosuchdir.append(basepath)
> > + bb.mkdirhier(basepath)
> > +
> > + processdebugsrc = "LC_ALL=C ; sort -z -u '%s' | egrep -v -z '(<internal>|<built-in>)$' | "
> > + # We need to ignore files that are not actually ours
> > + # we do this by only paying attention to items from this package
> > + processdebugsrc += "fgrep -z '%s' | "
> > + processdebugsrc += "(cd '%s' ; cpio -pd0mL --no-preserve-owner '%s%s' 2>/dev/null)"
> > +
> > + subprocess.call(processdebugsrc % (sourcefile, workbasedir, workparentdir, dvar, debugsrcdir), shell=True)
> > +
> > + # The copy by cpio may have resulted in some empty directories! Remove these
> > + for root, dirs, files in os.walk("%s%s" % (dvar, debugsrcdir)):
> > + for d in dirs:
> > + dir = os.path.join(root, d)
> > + #bb.note("rmdir -p %s" % dir)
> > + subprocess.call("rmdir -p %s 2>/dev/null" % dir, shell=True)
> > +
> > + # Also remove debugsrcdir if its empty
> > + for p in nosuchdir[::-1]:
> > + if os.path.exists(p) and not os.listdir(p):
> > + os.rmdir(p)
> >
> > def runstrip(file, elftype, d):
> > # Function to strip a single file, called from split_and_strip_files below
> > @@ -735,7 +735,7 @@ python split_and_strip_files () {
> > file_list = {}
> > file_links = {}
> > if (d.getVar('INHIBIT_PACKAGE_DEBUG_SPLIT', True) != '1') and \
> > - (d.getVar('INHIBIT_PACKAGE_STRIP', True) != '1'):
> > + (d.getVar('INHIBIT_PACKAGE_STRIP', True) != '1'):
> > for root, dirs, files in os.walk(dvar):
> > for f in files:
> > file = os.path.join(root, f)
> > diff --git a/meta/classes/package_ipk.bbclass b/meta/classes/package_ipk.bbclass
> > index a297a1f..e94586e 100644
> > --- a/meta/classes/package_ipk.bbclass
> > +++ b/meta/classes/package_ipk.bbclass
> > @@ -172,23 +172,23 @@ package_install_internal_ipk() {
> > }
> >
> > ipk_log_check() {
> > - target="$1"
> > - lf_path="$2"
> > -
> > - lf_txt="`cat $lf_path`"
> > - for keyword_die in "exit 1" "Collected errors" ERR Fail
> > - 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"
> > - echo -e "log_check: Matched keyword: [$keyword_die]\n"
> > - echo "$lf_txt" | grep -v log_check | grep -C 5 -i "$keyword_die"
> > - echo ""
> > - do_exit=1
> > - fi
> > - done
> > - test "$do_exit" = 1 && exit 1
> > - true
> > + target="$1"
> > + lf_path="$2"
> > +
> > + lf_txt="`cat $lf_path`"
> > + for keyword_die in "exit 1" "Collected errors" ERR Fail
> > + 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"
> > + echo -e "log_check: Matched keyword: [$keyword_die]\n"
> > + echo "$lf_txt" | grep -v log_check | grep -C 5 -i "$keyword_die"
> > + echo ""
> > + do_exit=1
> > + fi
> > + done
> > + test "$do_exit" = 1 && exit 1
> > + true
> > }
>
> This ^^ isn't python as commit message suggest, the same for
> utils.bbclass and package_rpm.bbclass change
Sorry, yes. These were tripping up some more automatic tests I was
experimenting with for checking whitespace so they got pulled into the
commit. I'll update the commit message since these shell functions were
all over the place (not even four space indented).
Cheers,
Richard
More information about the Openembedded-core
mailing list