[PATCH 0/3] toaster: cummulative 101418 patch

[PATCH 0/3] toaster: cummulative 101418 patch

[David Reyna]

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

These are three errors found that affect the 2.6 release for Toaster:
  * Bug 12959 - toaster: missing shutil import
    This causes a page failure when importing projects
  * Bug 12958 - toaster: bump django version to match build tools
    The avoids a toaster setup error with the 2.6 version of django
  * Bug 12957 - bad link for distro conf file
    The links to the distro conf file are broken and therefore blank
  * The simplicity of the patches should reflect their safety 



The following changes since commit b02f3bfe2fee291a9db85094e5f31b1933acf871:

  local.conf.sample.extended: add another warning to comment about GLIBC_GENERATE_LOCALES (2018-10-14 23:45:40 +0100)

are available in the git repository at:

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

David Reyna (3):
  toaster: bad link for distro conf file
  toaster: bump django version to match build tools
  toaster: missing shutil import

 lib/toaster/orm/models.py                                  | 2 +-
 lib/toaster/toastergui/tables.py                           | 8 +++-----
 lib/toaster/toastermain/management/commands/buildimport.py | 1 +
 toaster-requirements.txt                                   | 2 +-
 4 files changed, 6 insertions(+), 7 deletions(-)

-- 
1.9.1

[PATCH 1/3] toaster: bad link for distro conf file

[David Reyna]

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

The distro source path link is missing "conf/distro/", and the
display is using the machine link instead of the distro link.

[YOCTO #12957]

Signed-off-by: David Reyna <David.Reyna@windriver.com>
---
 lib/toaster/orm/models.py        | 2 +-
 lib/toaster/toastergui/tables.py | 8 +++-----
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/lib/toaster/orm/models.py b/lib/toaster/orm/models.py
index 849c22e..7720290 100644
--- a/lib/toaster/orm/models.py
+++ b/lib/toaster/orm/models.py
@@ -1877,7 +1877,7 @@ class Distro(models.Model):
     description = models.CharField(max_length=255)
 
     def get_vcs_distro_file_link_url(self):
-        path = self.name+'.conf'
+        path = 'conf/distro/%s.conf' % self.name
         return self.layer_version.get_vcs_file_link_url(path)
 
     def __unicode__(self):
diff --git a/lib/toaster/toastergui/tables.py b/lib/toaster/toastergui/tables.py
index 03bd2ae..9ff756b 100644
--- a/lib/toaster/toastergui/tables.py
+++ b/lib/toaster/toastergui/tables.py
@@ -1615,14 +1615,12 @@ class DistrosTable(ToasterTable):
                         hidden=True,
                         field_name="layer_version__get_vcs_reference")
 
-        wrtemplate_file_template = '''<code>conf/machine/{{data.name}}.conf</code>
-        <a href="{{data.get_vcs_machine_file_link_url}}" target="_blank"><span class="glyphicon glyphicon-new-window"></i></a>'''
-
+        distro_file_template = '''<code>conf/distro/{{data.name}}.conf</code>
+        {% if 'None' not in data.get_vcs_distro_file_link_url %}<a href="{{data.get_vcs_distro_file_link_url}}" target="_blank"><span class="glyphicon glyphicon-new-window"></i></a>{% endif %}'''
         self.add_column(title="Distro file",
                         hidden=True,
                         static_data_name="templatefile",
-                        static_data_template=wrtemplate_file_template)
-
+                        static_data_template=distro_file_template)
 
         self.add_column(title="Select",
                         help_text="Sets the selected distro to the project",
-- 
1.9.1

[PATCH 2/3] toaster: bump django version to match build tools

[David Reyna]

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

The version of django in the 2.6 release got bumped to 1.11.14.
The toaster requirements file needs to be updated to accept it.

[YOCTO #12958]

Signed-off-by: David Reyna <David.Reyna@windriver.com>
---
 toaster-requirements.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/toaster-requirements.txt b/toaster-requirements.txt
index c0ec368..a682b08 100644
--- a/toaster-requirements.txt
+++ b/toaster-requirements.txt
@@ -1,3 +1,3 @@
-Django>1.8,<1.11.9
+Django>1.8,<1.12
 beautifulsoup4>=4.4.0
 pytz
-- 
1.9.1

[PATCH 3/3] toaster: missing shutil import

[David Reyna]

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

The "buildimport.py" script is missing the "import shutil" line,
which causes a project import page failure.

[YOCTO #12959]

Signed-off-by: David Reyna <David.Reyna@windriver.com>
---
 lib/toaster/toastermain/management/commands/buildimport.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/lib/toaster/toastermain/management/commands/buildimport.py b/lib/toaster/toastermain/management/commands/buildimport.py
index 9e1cd6d..2d57ab5 100644
--- a/lib/toaster/toastermain/management/commands/buildimport.py
+++ b/lib/toaster/toastermain/management/commands/buildimport.py
@@ -55,6 +55,7 @@ import os
 import re
 import os.path
 import subprocess
+import shutil
 
 # Toaster variable section delimiters
 TOASTER_PROLOG = '#=== TOASTER_CONFIG_PROLOG ==='
-- 
1.9.1