Procedure for adding dependency

[Roderick W. Smith]

-----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

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-----