summaryrefslogtreecommitdiffstats
path: root/bitbake/lib/bb/ui
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2016-05-09 14:01:12 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-05-11 10:34:30 +0100
commit654eadfa30624c62018665da618287b6cb5c7e3c (patch)
treeddca0b2edbf92abfd7e7f6e9cd9c3499d704ea45 /bitbake/lib/bb/ui
parent5052bf92e40d8e0764a11e897f06d3d9c7c065e9 (diff)
downloadpoky-654eadfa30624c62018665da618287b6cb5c7e3c.tar.gz
bitbake: bitbake: Update logger.warn() -> logger.warning()
python deprecated logger.warn() in favour of logger.warning(). This is only used in bitbake code so we may as well just translate everything to avoid warnings under python 3. Its safe for python 2.7. (Bitbake rev: 676a5f592e8507e81b8f748d58acfea7572f8796) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'bitbake/lib/bb/ui')
-rw-r--r--bitbake/lib/bb/ui/buildinfohelper.py20
-rw-r--r--bitbake/lib/bb/ui/knotty.py8
-rw-r--r--bitbake/lib/bb/ui/toasterui.py6
3 files changed, 17 insertions, 17 deletions
diff --git a/bitbake/lib/bb/ui/buildinfohelper.py b/bitbake/lib/bb/ui/buildinfohelper.py
index 93979054d5..ff4da78cdb 100644
--- a/bitbake/lib/bb/ui/buildinfohelper.py
+++ b/bitbake/lib/bb/ui/buildinfohelper.py
@@ -664,8 +664,8 @@ class ORMWrapper(object):
664 dep_type = tdeptype, 664 dep_type = tdeptype,
665 target = target_obj)) 665 target = target_obj))
666 except KeyError as e: 666 except KeyError as e:
667 logger.warn("Could not add dependency to the package %s " 667 logger.warning("Could not add dependency to the package %s "
668 "because %s is an unknown package", p, px) 668 "because %s is an unknown package", p, px)
669 669
670 if len(packagedeps_objs) > 0: 670 if len(packagedeps_objs) > 0:
671 Package_Dependency.objects.bulk_create(packagedeps_objs) 671 Package_Dependency.objects.bulk_create(packagedeps_objs)
@@ -673,7 +673,7 @@ class ORMWrapper(object):
673 logger.info("No package dependencies created") 673 logger.info("No package dependencies created")
674 674
675 if len(errormsg) > 0: 675 if len(errormsg) > 0:
676 logger.warn("buildinfohelper: target_package_info could not identify recipes: \n%s", errormsg) 676 logger.warning("buildinfohelper: target_package_info could not identify recipes: \n%s", errormsg)
677 677
678 def save_target_image_file_information(self, target_obj, file_name, file_size): 678 def save_target_image_file_information(self, target_obj, file_name, file_size):
679 Target_Image_File.objects.create( target = target_obj, 679 Target_Image_File.objects.create( target = target_obj,
@@ -932,7 +932,7 @@ class BuildInfoHelper(object):
932 return lvo 932 return lvo
933 933
934 #if we get here, we didn't read layers correctly; dump whatever information we have on the error log 934 #if we get here, we didn't read layers correctly; dump whatever information we have on the error log
935 logger.warn("Could not match layer version for recipe path %s : %s", path, self.orm_wrapper.layer_version_objects) 935 logger.warning("Could not match layer version for recipe path %s : %s", path, self.orm_wrapper.layer_version_objects)
936 936
937 #mockup the new layer 937 #mockup the new layer
938 unknown_layer, _ = Layer.objects.get_or_create(name="Unidentified layer", layer_index_url="") 938 unknown_layer, _ = Layer.objects.get_or_create(name="Unidentified layer", layer_index_url="")
@@ -1003,7 +1003,7 @@ class BuildInfoHelper(object):
1003 self.internal_state['lvs'][self.orm_wrapper.get_update_layer_object(layerinfos[layer], self.brbe)] = layerinfos[layer]['version'] 1003 self.internal_state['lvs'][self.orm_wrapper.get_update_layer_object(layerinfos[layer], self.brbe)] = layerinfos[layer]['version']
1004 self.internal_state['lvs'][self.orm_wrapper.get_update_layer_object(layerinfos[layer], self.brbe)]['local_path'] = layerinfos[layer]['local_path'] 1004 self.internal_state['lvs'][self.orm_wrapper.get_update_layer_object(layerinfos[layer], self.brbe)]['local_path'] = layerinfos[layer]['local_path']
1005 except NotExisting as nee: 1005 except NotExisting as nee:
1006 logger.warn("buildinfohelper: cannot identify layer exception:%s ", nee) 1006 logger.warning("buildinfohelper: cannot identify layer exception:%s ", nee)
1007 1007
1008 1008
1009 def store_started_build(self, event, build_log_path): 1009 def store_started_build(self, event, build_log_path):
@@ -1240,14 +1240,14 @@ class BuildInfoHelper(object):
1240 self.orm_wrapper.save_target_package_information(self.internal_state['build'], target, imgdata, pkgdata, self.internal_state['recipes'], built_package=True) 1240 self.orm_wrapper.save_target_package_information(self.internal_state['build'], target, imgdata, pkgdata, self.internal_state['recipes'], built_package=True)
1241 self.orm_wrapper.save_target_package_information(self.internal_state['build'], target, imgdata.copy(), pkgdata, self.internal_state['recipes'], built_package=False) 1241 self.orm_wrapper.save_target_package_information(self.internal_state['build'], target, imgdata.copy(), pkgdata, self.internal_state['recipes'], built_package=False)
1242 except KeyError as e: 1242 except KeyError as e:
1243 logger.warn("KeyError in save_target_package_information" 1243 logger.warning("KeyError in save_target_package_information"
1244 "%s ", e) 1244 "%s ", e)
1245 1245
1246 try: 1246 try:
1247 self.orm_wrapper.save_target_file_information(self.internal_state['build'], target, filedata) 1247 self.orm_wrapper.save_target_file_information(self.internal_state['build'], target, filedata)
1248 except KeyError as e: 1248 except KeyError as e:
1249 logger.warn("KeyError in save_target_file_information" 1249 logger.warning("KeyError in save_target_file_information"
1250 "%s ", e) 1250 "%s ", e)
1251 1251
1252 1252
1253 1253
@@ -1392,7 +1392,7 @@ class BuildInfoHelper(object):
1392 Task_Dependency.objects.bulk_create(taskdeps_objects) 1392 Task_Dependency.objects.bulk_create(taskdeps_objects)
1393 1393
1394 if len(errormsg) > 0: 1394 if len(errormsg) > 0:
1395 logger.warn("buildinfohelper: dependency info not identify recipes: \n%s", errormsg) 1395 logger.warning("buildinfohelper: dependency info not identify recipes: \n%s", errormsg)
1396 1396
1397 1397
1398 def store_build_package_information(self, event): 1398 def store_build_package_information(self, event):
diff --git a/bitbake/lib/bb/ui/knotty.py b/bitbake/lib/bb/ui/knotty.py
index 268562770a..903d72b565 100644
--- a/bitbake/lib/bb/ui/knotty.py
+++ b/bitbake/lib/bb/ui/knotty.py
@@ -350,7 +350,7 @@ def main(server, eventHandler, params, tf = TerminalFilter):
350 tries -= 1 350 tries -= 1
351 if tries: 351 if tries:
352 continue 352 continue
353 logger.warn(event.msg) 353 logger.warning(event.msg)
354 continue 354 continue
355 355
356 if isinstance(event, logging.LogRecord): 356 if isinstance(event, logging.LogRecord):
@@ -377,7 +377,7 @@ def main(server, eventHandler, params, tf = TerminalFilter):
377 continue 377 continue
378 378
379 if isinstance(event, bb.build.TaskFailedSilent): 379 if isinstance(event, bb.build.TaskFailedSilent):
380 logger.warn("Logfile for failed setscene task is %s" % event.logfile) 380 logger.warning("Logfile for failed setscene task is %s" % event.logfile)
381 continue 381 continue
382 if isinstance(event, bb.build.TaskFailed): 382 if isinstance(event, bb.build.TaskFailed):
383 return_value = 1 383 return_value = 1
@@ -509,8 +509,8 @@ def main(server, eventHandler, params, tf = TerminalFilter):
509 continue 509 continue
510 510
511 if isinstance(event, bb.runqueue.sceneQueueTaskFailed): 511 if isinstance(event, bb.runqueue.sceneQueueTaskFailed):
512 logger.warn("Setscene task %s (%s) failed with exit code '%s' - real task will be run instead", 512 logger.warning("Setscene task %s (%s) failed with exit code '%s' - real task will be run instead",
513 event.taskid, event.taskstring, event.exitcode) 513 event.taskid, event.taskstring, event.exitcode)
514 continue 514 continue
515 515
516 if isinstance(event, bb.event.DepTreeGenerated): 516 if isinstance(event, bb.event.DepTreeGenerated):
diff --git a/bitbake/lib/bb/ui/toasterui.py b/bitbake/lib/bb/ui/toasterui.py
index 6bf4c1f030..addd5cc2fa 100644
--- a/bitbake/lib/bb/ui/toasterui.py
+++ b/bitbake/lib/bb/ui/toasterui.py
@@ -163,7 +163,7 @@ def main(server, eventHandler, params):
163 inheritlist, _ = server.runCommand(["getVariable", "INHERIT"]) 163 inheritlist, _ = server.runCommand(["getVariable", "INHERIT"])
164 164
165 if not "buildhistory" in inheritlist.split(" "): 165 if not "buildhistory" in inheritlist.split(" "):
166 logger.warn("buildhistory is not enabled. Please enable INHERIT += \"buildhistory\" to see image details.") 166 logger.warning("buildhistory is not enabled. Please enable INHERIT += \"buildhistory\" to see image details.")
167 build_history_enabled = False 167 build_history_enabled = False
168 168
169 if not params.observe_only: 169 if not params.observe_only:
@@ -433,7 +433,7 @@ def main(server, eventHandler, params):
433 buildinfohelper.store_dependency_information(event) 433 buildinfohelper.store_dependency_information(event)
434 continue 434 continue
435 435
436 logger.warn("Unknown event: %s", event) 436 logger.warning("Unknown event: %s", event)
437 return_value += 1 437 return_value += 1
438 438
439 except EnvironmentError as ioerror: 439 except EnvironmentError as ioerror:
@@ -461,5 +461,5 @@ def main(server, eventHandler, params):
461 if interrupted and return_value == 0: 461 if interrupted and return_value == 0:
462 return_value += 1 462 return_value += 1
463 463
464 logger.warn("Return value is %d", return_value) 464 logger.warning("Return value is %d", return_value)
465 return return_value 465 return return_value