diff options
| -rw-r--r-- | bitbake/lib/bb/cooker.py | 2 | ||||
| -rw-r--r-- | bitbake/lib/toaster/bldcontrol/management/commands/runbuilds.py | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/bitbake/lib/bb/cooker.py b/bitbake/lib/bb/cooker.py index b74affa7ec..911805a6e3 100644 --- a/bitbake/lib/bb/cooker.py +++ b/bitbake/lib/bb/cooker.py | |||
| @@ -1788,7 +1788,7 @@ class CookerCollectFiles(object): | |||
| 1788 | # When constructing an older style single regex, it's possible for BBMASK | 1788 | # When constructing an older style single regex, it's possible for BBMASK |
| 1789 | # to end up beginning with '|', which matches and masks _everything_. | 1789 | # to end up beginning with '|', which matches and masks _everything_. |
| 1790 | if mask.startswith("|"): | 1790 | if mask.startswith("|"): |
| 1791 | collectlog.warn("BBMASK contains regular expression beginning with '|', fixing: %s" % mask) | 1791 | collectlog.warning("BBMASK contains regular expression beginning with '|', fixing: %s" % mask) |
| 1792 | mask = mask[1:] | 1792 | mask = mask[1:] |
| 1793 | try: | 1793 | try: |
| 1794 | re.compile(mask) | 1794 | 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", "."), |
