meta: Convert getVar/getVarFlag(xxx, 1) -> (xxx, True)

Using "1" with getVar is bad coding style and "True" is preferred.
This patch is a sed over the meta directory of the form:

sed \
 -e 's:\(\.getVar([^,()]*, \)1 *):\1True):g' \
 -e 's:\(\.getVarFlag([^,()]*, [^,()]*, \)1 *):\1True):g' \
 -i `grep -ril getVar *`

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

5 files changed, 11 insertions, 11 deletions

diff --git a/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.24.0.bb b/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.24.0.bb
index 121babd28..603b38fee 100644
--- a/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.24.0.bb
+++ b/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.24.0.bb
@@ -58,7 +58,7 @@ PACKAGES_DYNAMIC += "gdk-pixbuf-loader-*"
 PACKAGES_DYNAMIC_virtclass-native = ""
 
 python populate_packages_prepend () {
-	postinst_pixbufloader = d.getVar("postinst_pixbufloader", 1)
+	postinst_pixbufloader = d.getVar("postinst_pixbufloader", True)
 
 	loaders_root = bb.data.expand('${libdir}/gdk-pixbuf-2.0/${LIBV}/loaders', d)
 
diff --git a/meta/recipes-gnome/gtk+/gtk+_2.12.7.bb b/meta/recipes-gnome/gtk+/gtk+_2.12.7.bb
index c6077ecb3..e45768d9d 100644
--- a/meta/recipes-gnome/gtk+/gtk+_2.12.7.bb
+++ b/meta/recipes-gnome/gtk+/gtk+_2.12.7.bb
@@ -34,8 +34,8 @@ PACKAGES_DYNAMIC += "gdk-pixbuf-loader-* gtk-immodule-* gtk-printbackend-*"
 python populate_packages_prepend () {
 	import os.path
 
-	prologue = d.getVar("postinst_prologue", 1)
-	postinst_pixbufloader = d.getVar("postinst_pixbufloader", 1)
+	prologue = d.getVar("postinst_prologue", True)
+	postinst_pixbufloader = d.getVar("postinst_pixbufloader", True)
 
 	gtk_libdir = bb.data.expand('${libdir}/gtk-2.0/${LIBV}', d)
 	loaders_root = os.path.join(gtk_libdir, 'loaders')
@@ -46,6 +46,6 @@ python populate_packages_prepend () {
 	do_split_packages(d, immodules_root, '^im-(.*)\.so$', 'gtk-immodule-%s', 'GTK input module for %s', prologue + 'gtk-query-immodules-2.0 > /etc/gtk-2.0/gtk.immodules')
 	do_split_packages(d, printmodules_root, '^libprintbackend-(.*)\.so$', 'gtk-printbackend-%s', 'GTK printbackend module for %s')
 
-        if (d.getVar('DEBIAN_NAMES', 1)):
+        if (d.getVar('DEBIAN_NAMES', True)):
                 d.setVar('PKG_${PN}', '${MLPREFIX}libgtk-2.0')
 }
diff --git a/meta/recipes-gnome/gtk+/gtk+_2.16.6.bb b/meta/recipes-gnome/gtk+/gtk+_2.16.6.bb
index 5fcb576bb..1e7a87f5d 100644
--- a/meta/recipes-gnome/gtk+/gtk+_2.16.6.bb
+++ b/meta/recipes-gnome/gtk+/gtk+_2.16.6.bb
@@ -34,8 +34,8 @@ PACKAGES_DYNAMIC += "gdk-pixbuf-loader-* gtk-immodule-* gtk-printbackend-*"
 python populate_packages_prepend () {
 	import os.path
 
-	prologue = d.getVar("postinst_prologue", 1)
-	postinst_pixbufloader = d.getVar("postinst_pixbufloader", 1)
+	prologue = d.getVar("postinst_prologue", True)
+	postinst_pixbufloader = d.getVar("postinst_pixbufloader", True)
 
 	gtk_libdir = bb.data.expand('${libdir}/gtk-2.0/${LIBV}', d)
 	loaders_root = os.path.join(gtk_libdir, 'loaders')
@@ -46,6 +46,6 @@ python populate_packages_prepend () {
 	do_split_packages(d, immodules_root, '^im-(.*)\.so$', 'gtk-immodule-%s', 'GTK input module for %s', prologue + 'gtk-query-immodules-2.0 > /etc/gtk-2.0/gtk.immodules')
 	do_split_packages(d, printmodules_root, '^libprintbackend-(.*)\.so$', 'gtk-printbackend-%s', 'GTK printbackend module for %s')
 
-        if (d.getVar('DEBIAN_NAMES', 1)):
+        if (d.getVar('DEBIAN_NAMES', True)):
                 d.setVar('PKG_${PN}', '${MLPREFIX}libgtk-2.0')
 }
diff --git a/meta/recipes-gnome/gtk+/gtk+_2.24.8.bb b/meta/recipes-gnome/gtk+/gtk+_2.24.8.bb
index 0b29ae139..07c0bfd62 100644
--- a/meta/recipes-gnome/gtk+/gtk+_2.24.8.bb
+++ b/meta/recipes-gnome/gtk+/gtk+_2.24.8.bb
@@ -41,7 +41,7 @@ PACKAGES_DYNAMIC += "gtk-immodule-* gtk-printbackend-*"
 python populate_packages_prepend () {
 	import os.path
 
-	prologue = d.getVar("postinst_prologue", 1)
+	prologue = d.getVar("postinst_prologue", True)
 
 	gtk_libdir = bb.data.expand('${libdir}/gtk-2.0/${LIBV}', d)
 	immodules_root = os.path.join(gtk_libdir, 'immodules')
@@ -50,6 +50,6 @@ python populate_packages_prepend () {
 	do_split_packages(d, immodules_root, '^im-(.*)\.so$', 'gtk-immodule-%s', 'GTK input module for %s', prologue + 'gtk-query-immodules-2.0 > /etc/gtk-2.0/gtk.immodules')
 	do_split_packages(d, printmodules_root, '^libprintbackend-(.*)\.so$', 'gtk-printbackend-%s', 'GTK printbackend module for %s')
 
-        if (d.getVar('DEBIAN_NAMES', 1)):
+        if (d.getVar('DEBIAN_NAMES', True)):
                 d.setVar('PKG_${PN}', '${MLPREFIX}libgtk-2.0')
 }
diff --git a/meta/recipes-gnome/gtk-engines/gtk-engines_2.20.2.bb b/meta/recipes-gnome/gtk-engines/gtk-engines_2.20.2.bb
index 233a6ee77..3ca6e81fa 100644
--- a/meta/recipes-gnome/gtk-engines/gtk-engines_2.20.2.bb
+++ b/meta/recipes-gnome/gtk-engines/gtk-engines_2.20.2.bb
@@ -31,8 +31,8 @@ inherit gnome
 python populate_packages_prepend() {
 	import os.path
 
-	engines_root = os.path.join(d.getVar('libdir', 1), "gtk-2.0/2.10.0/engines")
-	themes_root = os.path.join(d.getVar('datadir', 1), "themes")
+	engines_root = os.path.join(d.getVar('libdir', True), "gtk-2.0/2.10.0/engines")
+	themes_root = os.path.join(d.getVar('datadir', True), "themes")
 
 	do_split_packages(d, engines_root, '^lib(.*)\.so$', 'gtk-engine-%s', 'GTK %s theme engine', extra_depends='')
 	do_split_packages(d, themes_root, '(.*)', 'gtk-theme-%s', 'GTK theme %s', allow_dirs=True, extra_depends='')