Comment 4 for bug 1883112

Revision history for this message
Robie Basak (racb) wrote :

The obvious minimal fix would be something like:

- if ("un-blacklisting" in result) or ("isn't blacklisted" in result):
+ if (b"un-blacklisting" in result) or (b"isn't blacklisted" in result):

...since in Ubuntu Focal and Impish we know that we're running on Python 3, so 2+3 compatibility isn't required.

Cherry-picking the upstream change is additionally making new assumptions about the behaviour of ceph's CLI I think - that it returns the correct exit status. Have you checked to ensure that the behaviour of the version of ceph in Focal and Impish is as expected in both the success and failure cases? If so then since presumably this code never worked on Focal and Impish before, then the cherry-pick is fine. But if you want to use the upstream (non-minimal) fix that makes this additional assumption then think it needs to be confirmed before accepting.

For reference, SRU policy says the following. In this case I think either way is fine providing that assumptions are checked.

> In line with this, the requirements for stable updates are not necessarily the same as those in the development release. When preparing future releases, one of our goals is to construct the most elegant and maintainable system possible, and this often involves fundamental improvements to the system's architecture, rearranging packages to avoid bundled copies of other software so that we only have to maintain it in one place, and so on. However, once we have completed a release, the priority is normally to minimise risk caused by changes not explicitly required to fix qualifying bugs, and this tends to be well-correlated with minimising the size of those changes. As such, the same bug may need to be fixed in different ways in stable and development releases.