Merge ~sylvain-pineau/plainbox-provider-resource:fix-1850761 into plainbox-provider-resource:master

Proposed by Sylvain Pineau
Status: Superseded
Proposed branch: ~sylvain-pineau/plainbox-provider-resource:fix-1850761
Merge into: plainbox-provider-resource:master
Diff against target: 15 lines (+4/-0) (has conflicts)
1 file modified
jobs/resource.pxu (+4/-0)
Conflict in jobs/resource.pxu
Reviewer Review Type Date Requested Status
Checkbox Developers Pending
Review via email: mp+375092@code.launchpad.net

Description of the change

debian->ubuntu

debian does work as a default but not when specifying a os-version-id

To post a comment you must log in.
3fe18f9... by Sylvain Pineau

Update the iw packaging meta data os-id: (debian -> ubuntu)

Unmerged commits

3fe18f9... by Sylvain Pineau

Update the iw packaging meta data os-id: (debian -> ubuntu)

9822775... by Sylvain Pineau

Add a packaging meta-data requirement to get iw 5.3 on bionic from cert ppa

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/jobs/resource.pxu b/jobs/resource.pxu
2index 35446cb..d9c6e71 100644
3--- a/jobs/resource.pxu
4+++ b/jobs/resource.pxu
5@@ -60,7 +60,11 @@ Depends: python3-requests-unixsocket
6
7 # This is for wireless_sta_protocol
8 unit: packaging meta-data
9+<<<<<<< jobs/resource.pxu
10 os-id: debian
11+=======
12+os-id: ubuntu
13+>>>>>>> jobs/resource.pxu
14 os-version-id: 18.04
15 Depends: iw (>= 5.3)
16

Subscribers

People subscribed via source and target branches