summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFrazer Clews <frazer.clews@codethink.co.uk>2020-01-14 14:46:06 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2020-02-06 22:49:29 +0000
commit6ca91a91afd2abe8a3d9ec70a35fe55564460d7d (patch)
tree2156d46929b84457b705f4826175ccd88cc8c009
parentcdcacf26ec95cfa874b2060c059478666956cdca (diff)
downloadpoky-6ca91a91afd2abe8a3d9ec70a35fe55564460d7d.tar.gz
bitbake: cooker/toaster: replaced deprecated method warn() with warning()
Removed the deprecated methods as it will only cause problems later on, and since warn() just calls warning(), it shouldn't change anything (Bitbake rev: a194f275235f22411cb2368f06a44f61ceb6a0f3) Signed-off-by: Frazer Clews <frazer.clews@codethink.co.uk> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--bitbake/lib/bb/cooker.py2
-rw-r--r--bitbake/lib/toaster/bldcontrol/management/commands/runbuilds.py6
2 files changed, 4 insertions, 4 deletions
diff --git a/bitbake/lib/bb/cooker.py b/bitbake/lib/bb/cooker.py
index 8407db8b00..1124332186 100644
--- a/bitbake/lib/bb/cooker.py
+++ b/bitbake/lib/bb/cooker.py
@@ -1784,7 +1784,7 @@ class CookerCollectFiles(object):
1784 # When constructing an older style single regex, it's possible for BBMASK 1784 # When constructing an older style single regex, it's possible for BBMASK
1785 # to end up beginning with '|', which matches and masks _everything_. 1785 # to end up beginning with '|', which matches and masks _everything_.
1786 if mask.startswith("|"): 1786 if mask.startswith("|"):
1787 collectlog.warn("BBMASK contains regular expression beginning with '|', fixing: %s" % mask) 1787 collectlog.warning("BBMASK contains regular expression beginning with '|', fixing: %s" % mask)
1788 mask = mask[1:] 1788 mask = mask[1:]
1789 try: 1789 try:
1790 re.compile(mask) 1790 re.compile(mask)
diff --git a/bitbake/lib/toaster/bldcontrol/management/commands/runbuilds.py b/bitbake/lib/toaster/bldcontrol/management/commands/runbuilds.py
index 50ec409860..19f659ec41 100644
--- a/bitbake/lib/toaster/bldcontrol/management/commands/runbuilds.py
+++ b/bitbake/lib/toaster/bldcontrol/management/commands/runbuilds.py
@@ -168,17 +168,17 @@ class Command(BaseCommand):
168 try: 168 try:
169 self.cleanup() 169 self.cleanup()
170 except Exception as e: 170 except Exception as e:
171 logger.warn("runbuilds: cleanup exception %s" % str(e)) 171 logger.warning("runbuilds: cleanup exception %s" % str(e))
172 172
173 try: 173 try:
174 self.archive() 174 self.archive()
175 except Exception as e: 175 except Exception as e:
176 logger.warn("runbuilds: archive exception %s" % str(e)) 176 logger.warning("runbuilds: archive exception %s" % str(e))
177 177
178 try: 178 try:
179 self.schedule() 179 self.schedule()
180 except Exception as e: 180 except Exception as e:
181 logger.warn("runbuilds: schedule exception %s" % str(e)) 181 logger.warning("runbuilds: schedule exception %s" % str(e))
182 182
183 def handle(self, **options): 183 def handle(self, **options):
184 pidfile_path = os.path.join(os.environ.get("BUILDDIR", "."), 184 pidfile_path = os.path.join(os.environ.get("BUILDDIR", "."),