diff options
Diffstat (limited to 'bitbake/lib/toaster')
-rw-r--r-- | bitbake/lib/toaster/bldcontrol/localhostbecontroller.py | 2 | ||||
-rw-r--r-- | bitbake/lib/toaster/bldcontrol/management/commands/runbuilds.py | 6 | ||||
-rw-r--r-- | bitbake/lib/toaster/bldcontrol/models.py | 10 | ||||
-rw-r--r-- | bitbake/lib/toaster/contrib/tts/shellutils.py | 2 | ||||
-rw-r--r-- | bitbake/lib/toaster/contrib/tts/urlcheck.py | 4 | ||||
-rw-r--r-- | bitbake/lib/toaster/toastermain/urls.py | 2 |
6 files changed, 13 insertions, 13 deletions
diff --git a/bitbake/lib/toaster/bldcontrol/localhostbecontroller.py b/bitbake/lib/toaster/bldcontrol/localhostbecontroller.py index 7def1f3a17..7b2f126e98 100644 --- a/bitbake/lib/toaster/bldcontrol/localhostbecontroller.py +++ b/bitbake/lib/toaster/bldcontrol/localhostbecontroller.py | |||
@@ -66,7 +66,7 @@ class LocalhostBEController(BuildEnvironmentController): | |||
66 | err = "command: %s \n%s" % (command, out) | 66 | err = "command: %s \n%s" % (command, out) |
67 | else: | 67 | else: |
68 | err = "command: %s \n%s" % (command, err) | 68 | err = "command: %s \n%s" % (command, err) |
69 | logger.warn("localhostbecontroller: shellcmd error %s" % err) | 69 | logger.warning("localhostbecontroller: shellcmd error %s" % err) |
70 | raise ShellCmdException(err) | 70 | raise ShellCmdException(err) |
71 | else: | 71 | else: |
72 | logger.debug("localhostbecontroller: shellcmd success") | 72 | logger.debug("localhostbecontroller: shellcmd success") |
diff --git a/bitbake/lib/toaster/bldcontrol/management/commands/runbuilds.py b/bitbake/lib/toaster/bldcontrol/management/commands/runbuilds.py index 27289be5fd..5532b9deb2 100644 --- a/bitbake/lib/toaster/bldcontrol/management/commands/runbuilds.py +++ b/bitbake/lib/toaster/bldcontrol/management/commands/runbuilds.py | |||
@@ -164,16 +164,16 @@ class Command(NoArgsCommand): | |||
164 | try: | 164 | try: |
165 | self.cleanup() | 165 | self.cleanup() |
166 | except Exception as e: | 166 | except Exception as e: |
167 | logger.warn("runbuilds: cleanup exception %s" % str(e)) | 167 | logger.warning("runbuilds: cleanup exception %s" % str(e)) |
168 | 168 | ||
169 | try: | 169 | try: |
170 | self.archive() | 170 | self.archive() |
171 | except Exception as e: | 171 | except Exception as e: |
172 | logger.warn("runbuilds: archive exception %s" % str(e)) | 172 | logger.warning("runbuilds: archive exception %s" % str(e)) |
173 | 173 | ||
174 | try: | 174 | try: |
175 | self.schedule() | 175 | self.schedule() |
176 | except Exception as e: | 176 | except Exception as e: |
177 | logger.warn("runbuilds: schedule exception %s" % str(e)) | 177 | logger.warning("runbuilds: schedule exception %s" % str(e)) |
178 | 178 | ||
179 | time.sleep(1) | 179 | time.sleep(1) |
diff --git a/bitbake/lib/toaster/bldcontrol/models.py b/bitbake/lib/toaster/bldcontrol/models.py index cb49a58c45..e09ad20dc3 100644 --- a/bitbake/lib/toaster/bldcontrol/models.py +++ b/bitbake/lib/toaster/bldcontrol/models.py | |||
@@ -98,11 +98,11 @@ class BuildRequest(models.Model): | |||
98 | # Check that the state we're trying to set is not going backwards | 98 | # Check that the state we're trying to set is not going backwards |
99 | # e.g. from REQ_FAILED to REQ_INPROGRESS | 99 | # e.g. from REQ_FAILED to REQ_INPROGRESS |
100 | if self.old_state != self.state and self.old_state > self.state: | 100 | if self.old_state != self.state and self.old_state > self.state: |
101 | logger.warn("Invalid state change requested: " | 101 | logger.warning("Invalid state change requested: " |
102 | "Cannot go from %s to %s - ignoring request" % | 102 | "Cannot go from %s to %s - ignoring request" % |
103 | (BuildRequest.REQUEST_STATE[self.old_state][1], | 103 | (BuildRequest.REQUEST_STATE[self.old_state][1], |
104 | BuildRequest.REQUEST_STATE[self.state][1]) | 104 | BuildRequest.REQUEST_STATE[self.state][1]) |
105 | ) | 105 | ) |
106 | # Set property back to the old value | 106 | # Set property back to the old value |
107 | self.state = self.old_state | 107 | self.state = self.old_state |
108 | return | 108 | return |
diff --git a/bitbake/lib/toaster/contrib/tts/shellutils.py b/bitbake/lib/toaster/contrib/tts/shellutils.py index c2012edf83..ce64c06340 100644 --- a/bitbake/lib/toaster/contrib/tts/shellutils.py +++ b/bitbake/lib/toaster/contrib/tts/shellutils.py | |||
@@ -133,7 +133,7 @@ def run_shell_cmd(command, cwd=None): | |||
133 | err = "command: %s \n%s" % (command, out) | 133 | err = "command: %s \n%s" % (command, out) |
134 | else: | 134 | else: |
135 | err = "command: %s \n%s" % (command, err) | 135 | err = "command: %s \n%s" % (command, err) |
136 | config.logger.warn("_shellcmd: error \n%s\n%s", out, err) | 136 | config.logger.warning("_shellcmd: error \n%s\n%s", out, err) |
137 | raise ShellCmdException(err) | 137 | raise ShellCmdException(err) |
138 | else: | 138 | else: |
139 | #config.logger.debug("localhostbecontroller: shellcmd success\n%s" % out) | 139 | #config.logger.debug("localhostbecontroller: shellcmd success\n%s" % out) |
diff --git a/bitbake/lib/toaster/contrib/tts/urlcheck.py b/bitbake/lib/toaster/contrib/tts/urlcheck.py index 0820f82e2a..001fcee96a 100644 --- a/bitbake/lib/toaster/contrib/tts/urlcheck.py +++ b/bitbake/lib/toaster/contrib/tts/urlcheck.py | |||
@@ -26,12 +26,12 @@ def validate_html5(url): | |||
26 | warnings = int(resp['x-w3c-validator-warnings']) | 26 | warnings = int(resp['x-w3c-validator-warnings']) |
27 | 27 | ||
28 | if status == 'Invalid': | 28 | if status == 'Invalid': |
29 | config.logger.warn("Failed %s is %s\terrors %s warnings %s (check at %s)", url, status, errors, warnings, urlrequest) | 29 | config.logger.warning("Failed %s is %s\terrors %s warnings %s (check at %s)", url, status, errors, warnings, urlrequest) |
30 | else: | 30 | else: |
31 | config.logger.debug("OK! %s", url) | 31 | config.logger.debug("OK! %s", url) |
32 | 32 | ||
33 | except Exception as exc: | 33 | except Exception as exc: |
34 | config.logger.warn("Failed validation call: %s", exc) | 34 | config.logger.warning("Failed validation call: %s", exc) |
35 | return (status, errors, warnings) | 35 | return (status, errors, warnings) |
36 | 36 | ||
37 | 37 | ||
diff --git a/bitbake/lib/toaster/toastermain/urls.py b/bitbake/lib/toaster/toastermain/urls.py index 534679dc50..530a42ffab 100644 --- a/bitbake/lib/toaster/toastermain/urls.py +++ b/bitbake/lib/toaster/toastermain/urls.py | |||
@@ -84,7 +84,7 @@ for t in os.walk(os.path.dirname(currentdir)): | |||
84 | if not conflict: | 84 | if not conflict: |
85 | urlpatterns.insert(0, url(r'^' + modulename + '/', include ( modulename + '.urls'))) | 85 | urlpatterns.insert(0, url(r'^' + modulename + '/', include ( modulename + '.urls'))) |
86 | else: | 86 | else: |
87 | logger.warn("Module \'%s\' has a regexp conflict, was not added to the urlpatterns" % modulename) | 87 | logger.warning("Module \'%s\' has a regexp conflict, was not added to the urlpatterns" % modulename) |
88 | 88 | ||
89 | from pprint import pformat | 89 | from pprint import pformat |
90 | #logger.debug("urlpatterns list %s", pformat(urlpatterns)) | 90 | #logger.debug("urlpatterns list %s", pformat(urlpatterns)) |