[oe-commits] [bitbake] 11/14: toaster: remove SSTATE_MIRRORS from blacklists in views

[git at git.openembedded.org]

rpurdie pushed a commit to branch master-next
in repository bitbake.

commit 2166cbd197ae70e7e88db173f4d0f04408e89656
Author: Sujith H <sujith.h at gmail.com>
AuthorDate: Fri Jun 24 16:25:53 2016 +0100

    toaster: remove SSTATE_MIRRORS from blacklists in views
    
    Remove SSTATE_MIRRORS variable from blacklists in views.py
    This helps user to point mirrors using SSTATE_MIRRORS with
    toaster.
    
    [#YOCTO 9598]
    
    Signed-off-by: Sujith H <sujith.h at gmail.com>
    Signed-off-by: Michael Wood <michael.g.wood at intel.com>
    Signed-off-by: Richard Purdie <richard.purdie at linuxfoundation.org>
---
 lib/toaster/toastergui/views.py | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/lib/toaster/toastergui/views.py b/lib/toaster/toastergui/views.py
index 28ff67b..c40273c 100755
--- a/lib/toaster/toastergui/views.py
+++ b/lib/toaster/toastergui/views.py
@@ -1533,11 +1533,16 @@ if True:
     def xhr_configvaredit(request, pid):
         try:
             prj = Project.objects.get(id = pid)
+            # There are cases where user can add variables which hold values
+            # like http://, file:/// etc. In such case a simple split(":")
+            # would fail. One example is SSTATE_MIRRORS variable. So we use
+            # max_split var to handle them.
+            max_split = 1
             # add conf variables
             if 'configvarAdd' in request.POST:
                 t=request.POST['configvarAdd'].strip()
                 if ":" in t:
-                    variable, value = t.split(":")
+                    variable, value = t.split(":", max_split)
                 else:
                     variable = t
                     value = ""
@@ -1547,7 +1552,7 @@ if True:
             if 'configvarChange' in request.POST:
                 t=request.POST['configvarChange'].strip()
                 if ":" in t:
-                    variable, value = t.split(":")
+                    variable, value = t.split(":", max_split)
                 else:
                     variable = t
                     value = ""
@@ -2210,7 +2215,7 @@ if True:
         vars_blacklist  = {
             'PARALLEL_MAKE','BB_NUMBER_THREADS',
             'BB_DISKMON_DIRS','BB_NUMBER_THREADS','CVS_PROXY_HOST','CVS_PROXY_PORT',
-            'PARALLEL_MAKE','SSTATE_MIRRORS','TMPDIR',
+            'PARALLEL_MAKE','TMPDIR',
             'all_proxy','ftp_proxy','http_proxy ','https_proxy'
             }
 

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.