PlainBox (Toolkit)

Merge ~sylvain-pineau/plainbox:fix-1719406 into plainbox:master

  1. Git
  2. lp:~sylvain-pineau/plainbox
  3. fix-1719406
  4. Merge into master
Proposed by Sylvain Pineau
Status: Merged
Approved by: Sylvain Pineau
Approved revision: af7f14510a8a77013fafbca4bfc390a7b6f3632c
Merged at revision: b36bf782d6027228427f10e3a23778a2f49c4340
Proposed branch: ~sylvain-pineau/plainbox:fix-1719406
Merge into: plainbox:master
Diff against target: 44 lines (+4/-4)
2 files modified
plainbox/impl/providers/exporters/data/checkbox.json (+2/-2)
plainbox/impl/providers/exporters/data/hexr.xml (+2/-2)
Reviewer Review Type Date Requested Status
Paul Larson Approve
Review via email: mp+331478@code.launchpad.net

Description of the change

Fixes linked bug

To post a comment you must log in.
Revision history for this message
Paul Larson (pwlars) wrote :

This seems reasonable at least, though I'm surprised there's any way for something in the list to not have a name? +1

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/plainbox/impl/providers/exporters/data/checkbox.json b/plainbox/impl/providers/exporters/data/checkbox.json
2index 799cd4d..31bfff6 100644
3--- a/plainbox/impl/providers/exporters/data/checkbox.json
4+++ b/plainbox/impl/providers/exporters/data/checkbox.json
5@@ -6,7 +6,7 @@
6 {%- if ns ~ 'package' in state.resource_map %}
7 "packages": [
8 {%- set package_resource_list = state.resource_map[ns ~ 'package'] %}
9- {%- for package_resource in package_resource_list %}
10+ {%- for package_resource in package_resource_list if package_resource.name %}
11 {
12 "name": "{{ package_resource.name }}",
13 "version": "{{ package_resource.version }}"
14@@ -17,7 +17,7 @@
15 {%- if ns ~ 'snap' in state.resource_map %}
16 "snap-packages": [
17 {%- set snap_package_resource_list = state.resource_map[ns ~ 'snap'] %}
18- {%- for snap_package_resource in snap_package_resource_list %}
19+ {%- for snap_package_resource in snap_package_resource_list if snap_package_resource.name %}
20 {
21 "name": "{{ snap_package_resource.name }}",
22 {%- for key in snap_package_resource|reject('is_name')|sort %}
23diff --git a/plainbox/impl/providers/exporters/data/hexr.xml b/plainbox/impl/providers/exporters/data/hexr.xml
24index 8509205..649c84c 100644
25--- a/plainbox/impl/providers/exporters/data/hexr.xml
26+++ b/plainbox/impl/providers/exporters/data/hexr.xml
27@@ -91,7 +91,7 @@
28 {%- if ns ~ 'package' in state.resource_map %}
29 {%- set package_resource_list = state.resource_map[ns ~ 'package'] %}
30 <packages>
31- {%- for package_resource in package_resource_list %}
32+ {%- for package_resource in package_resource_list if package_resource.name %}
33 <package id="{{ loop.index0 }}" name="{{ package_resource.name }}">
34 {%- for key in package_resource|reject('is_name')|sort %}
35 <property name="{{ key }}" type="str">{{ package_resource[key] }}</property>
36@@ -105,7 +105,7 @@
37 {%- if ns ~ 'snap' in state.resource_map %}
38 {%- set snap_package_resource_list = state.resource_map[ns ~ 'snap'] %}
39 <snap_packages>
40- {%- for snap_package_resource in snap_package_resource_list %}
41+ {%- for snap_package_resource in snap_package_resource_list if snap_package_resource.name %}
42 <snap_package id="{{ loop.index0 }}" name="{{ snap_package_resource.name }}">
43 {%- for key in snap_package_resource|reject('is_name')|sort %}
44 <property name="{{ key }}" type="str">{{ snap_package_resource[key] }}</property>

Subscribers

People subscribed via source and target branches