Re: [yocto][meta-spdxscanner][PATCH V2] Remove redundant code.

2020-04-02 Thread Joshua Watt 


On 4/2/20 11:45 AM, Li, Xiaoming wrote:

FOLDER_ID has already been assigned a defalut value "1", so there is no
need add 'or "1"' here.

Signed-off-by: Li Xiaoming 
---
  classes/fossology-rest.bbclass | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/classes/fossology-rest.bbclass b/classes/fossology-rest.bbclass
index 5c5ef70..69f4998 100644
--- a/classes/fossology-rest.bbclass
+++ b/classes/fossology-rest.bbclass
@@ -230,7 +230,7 @@ def get_folder_id(d):
  folder_name = d.getVar('FOLDER_NAME')
  folder_id = create_folder(d, folder_name)
  else:
-folder_id = (d.getVar('FOLDER_ID', True) or "1")
+folder_id = d.getVar('FOLDER_ID', False)


You probably shouldn't be disabling variable expansion here (i.e. 
passing False as the second argument)?


  
  bb.note("Folder Id =  " + str(folder_id))

  return str(folder_id)


-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.

View/Reply Online (#49037): https://lists.yoctoproject.org/g/yocto/message/49037
Mute This Topic: https://lists.yoctoproject.org/mt/72720682/21656
Group Owner: yocto+ow...@lists.yoctoproject.org
Unsubscribe: https://lists.yoctoproject.org/g/yocto/unsub  
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-

[yocto][meta-spdxscanner][PATCH V2] Remove redundant code.

2020-04-02 Thread Li, Xiaoming 
FOLDER_ID has already been assigned a defalut value "1", so there is no
need add 'or "1"' here.

Signed-off-by: Li Xiaoming 
---
 classes/fossology-rest.bbclass | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/classes/fossology-rest.bbclass b/classes/fossology-rest.bbclass
index 5c5ef70..69f4998 100644
--- a/classes/fossology-rest.bbclass
+++ b/classes/fossology-rest.bbclass
@@ -230,7 +230,7 @@ def get_folder_id(d):
 folder_name = d.getVar('FOLDER_NAME')
 folder_id = create_folder(d, folder_name)
 else:
-folder_id = (d.getVar('FOLDER_ID', True) or "1")
+folder_id = d.getVar('FOLDER_ID', False)
 
 bb.note("Folder Id =  " + str(folder_id))
 return str(folder_id)
-- 
2.17.1



-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.

View/Reply Online (#49028): https://lists.yoctoproject.org/g/yocto/message/49028
Mute This Topic: https://lists.yoctoproject.org/mt/72720682/21656
Group Owner: yocto+ow...@lists.yoctoproject.org
Unsubscribe: https://lists.yoctoproject.org/g/yocto/unsub  
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-