Procedure for adding dependency

[Sylvain Pineau]

On 04/02/2016 17:30, Jeffrey Lane wrote:
> On Thu, Feb 4, 2016 at 10:37 AM, Roderick W. Smith
> <rod.smith at canonical.com> wrote:
>> -----BEGIN PGP SIGNED MESSAGE-----
>> Hash: SHA1
>>
>> On 02/03/2016 10:47 PM, Pierre Equoy wrote:
>>> P.S.: It looks like the merge that was done after your modification
>>> is breaking things [1], but I'm not sure why exactly (I mean it's a
>>> merge conflict but I'm not sure of the root cause).
>>>
>>> [1] for example on Xenial build:
>>> https://launchpadlibrarian.net/236184287/buildlog.txt.gz
>> It looks like a problem with this merge for the whitelist support:
>>
>> https://code.launchpad.net/~rodsmith/plainbox-provider-canonical-certification/+git/plainbox-provider-canonical-certification/+ref/new-cpu-test/
>>
>> Could the system be trying to merge that in automatically after it was
>> already approved and merged by Jeff? Of possible relevance, I
>> accidentally submitted the same changes to the wrong location and
>> couldn't figure out how to request a merge from there:
>>
>> https://git.launchpad.net/~rodsmith/checkbox/commit/?h=new-cpu-test
> Yeah, I couldn't figure out what the issue was either.  I used PMR to
> merge it (unless there is some other instance of it sitting out there
> someone else is running).  But it merged clean according to PMR.
> There was no mention of conflicts or anything like that during the
> merge and push to trunk.
>
> I asked about it in the ce-certification-qa channel, but it was after
> EOD for most of the team.
>
it was a mistake on our side, as both the packaging branch and master 
trunk had the provider files.
The packaging branch should only had a debian dir nothing else [1].
I fixed it and requested new builds (in our dev ppa). They all build 
fine now

[1] 
https://git.launchpad.net/~checkbox-dev/plainbox-provider-canonical-certification/+git/packaging-server/commit/?id=56e3527f09fbdcdc96a57925560a8739cd458f8b
>> I just dropped that one, since I assumed it wouldn't cause any real
>> problems, but if the build scripts are picking it up, maybe something
>> needs to be done with it...?
>>
>> If there's something else I need to do to help clear this up, please
>> tell me!
>>
>> - --
>> Rod Smith
>> Server and Cloud Certification Engineer
>> rod.smith at canonical.com
>> -----BEGIN PGP SIGNATURE-----
>> Version: GnuPG v2.0.22 (GNU/Linux)
>>
>> iQEcBAEBAgAGBQJWs3AuAAoJEFgyRI+V0Fjmg3IIAI9846UkkhWQBATGOA8YUWhl
>> KZ7WFM2uKbvRl5B3b+tZNCjlzjTbhoXI1harXrxic1vUweiIzYN6Lexa+GwlIeTV
>> uyDOGQajtAE1CNXZmqXKkeQvG/4gYxsQ9RamVCPEUnB6CgHD+FR8g61pKTUkgRrH
>> CNC87KVJe7HpsvgWQpCpxLHRl7UTSNEigCPmyQJN8gQcoYcY3URcCxzBBzML1n+H
>> 6+sAscVtOnLdwnVM+yzjP32ZsBQZhnheBqDT2ZWzw/u4YwLlolryemI/WneMVavw
>> btVO2pacfBqQTOb4l7p6Uc+x1v3pt7NnHXibDEGkY6fEhOHkZJ5356u+fZR+mns=
>> =QE8t
>> -----END PGP SIGNATURE-----
>
>