[PATCH 0/1] toaster: cummulative 123117 patch

[PATCH 0/1] toaster: cummulative 123117 patch

[David Reyna]

From: David Reyna <David.Reyna@windriver.com>


This patch repairs the second of two patch file corruptions that affected
#12192 "toaster: update Toaster for Django 1.11". The first corruption was found and
fixed by Richard before being committed.

That had been my first "V2" patch, and unfortunately the string "V2 " ended up in 
more places that just the header.


The following changes since commit 591b5b241d78e9d4ef8d5d3dd6280f7a4ff7ee17:

  bitbake: build.py: Don't return dependencies for tasks which don't exist (2017-12-28 15:08:34 +0000)

are available in the git repository at:

  git://git.yoctoproject.org/poky-contrib dreyna/toaster/repair_url_12459
  http://git.yoctoproject.org/cgit.cgi/poky-contrib/log/?h=dreyna/submit/dreyna/toaster/cummulative_123117_patch

David Reyna (1):
  toaster: corrupted patch for bldcollector URL file

 lib/toaster/bldcollector/urls.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

-- 
1.9.1

[PATCH 1/1] toaster: corrupted patch for bldcollector URL file

[David Reyna]

From: David Reyna <David.Reyna@windriver.com>

Fix a fatal error introduced by a corrupted patch file
submission.

[YOCTO #12459]

Signed-off-by: David Reyna <David.Reyna@windriver.com>
---
 lib/toaster/bldcollector/urls.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/toaster/bldcollector/urls.py b/lib/toaster/bldcollector/urls.py
index ed379bf..888175d 100644
--- a/lib/toaster/bldcollector/urls.py
+++ b/lib/toaster/bldcollector/urls.py
@@ -17,7 +17,7 @@
 # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 
 
-from djaV2 ngo.conf.urls import include, url
+from django.conf.urls import include, url
 
 import bldcollector.views
 
-- 
1.9.1