Merge ~ltrager/maas:lp1702567 into maas:master

Proposed by Lee Trager
Status: Rejected
Rejected by: Adam Collard
Proposed branch: ~ltrager/maas:lp1702567
Merge into: maas:master
Diff against target: 17 lines (+2/-1)
1 file modified
debian/rules (+2/-1)
Reviewer Review Type Date Requested Status
MAAS Lander Approve
Andres Rodriguez (community) Needs Fixing
Review via email: mp+335859@code.launchpad.net

Commit message

LP: #1702567 - Make sure maas_api_helper.py is included python3-django-maas.

To post a comment you must log in.
Revision history for this message
Andres Rodriguez (andreserl) wrote :

This is not the right way to add the file. There are install files that need to ha del this or the setup.py

That said, why is this a problem now and not before? No environment I know of seems affected by this...

review: Needs Fixing
Revision history for this message
Lee Trager (ltrager) wrote :

This has been a problem for awhile when using make package-dev. I've fixed it previously by manually adding the sym link between from /usr/lib/python3/dist-packages/metadataserver/user_data/templates/snippets/maas_api_helper.py and /usr/lib/python3/dist-packages/provisioningserver/refresh/maas_api_helper.py. This fix survives reinstalls.

When I went to rebuild my environment last week for Bionic I ran into this issue again and was able to come up with this patch to actually fix it.

Revision history for this message
MAAS Lander (maas-lander) wrote :

UNIT TESTS
-b lp1702567 lp:~ltrager/maas into -b master lp:~maas-committers/maas

STATUS: SUCCESS
COMMIT: 47656e27bb0d95b6c179a3f17deda4c197c07ff8

review: Approve
Revision history for this message
Newell Jensen (newell-jensen) wrote :

To add weight to this branch being an issue, I have recently ran into this thinking it was a new bug which I have now marked as a duplicate #1813083

Unmerged commits

47656e2... by Lee Trager

LP: #1702567 - Make sure maas_api_helper.py is included python3-django-maas

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
diff --git a/debian/rules b/debian/rules
index 276e347..43c2ee7 100755
--- a/debian/rules
+++ b/debian/rules
@@ -61,10 +61,11 @@ override_dh_auto_install:
61 install -m 644 $(CURDIR)/debian/maas-dhcp.apparmor \61 install -m 644 $(CURDIR)/debian/maas-dhcp.apparmor \
62 $(CURDIR)/debian/tmp/etc/apparmor.d/dhcpd.d/maas62 $(CURDIR)/debian/tmp/etc/apparmor.d/dhcpd.d/maas
6363
64 # install python3 twisted plugins64 # install python3 twisted plugins and make sure maas_api_helper is installed
65 set -ex; for python in $(PYTHON3); do \65 set -ex; for python in $(PYTHON3); do \
66 dh_install twisted/plugins/maasregiond.py usr/lib/$$python/dist-packages/twisted/plugins -pmaas-region-api; \66 dh_install twisted/plugins/maasregiond.py usr/lib/$$python/dist-packages/twisted/plugins -pmaas-region-api; \
67 dh_install twisted/plugins/maasrackd.py usr/lib/$$python/dist-packages/twisted/plugins -pmaas-rack-controller; \67 dh_install twisted/plugins/maasrackd.py usr/lib/$$python/dist-packages/twisted/plugins -pmaas-rack-controller; \
68 dh_install src/provisioningserver/refresh/maas_api_helper.py usr/lib/$$python/dist-packages/metadataserver/user_data/templates/snippets -ppython3-django-maas; \
68 done69 done
6970
70 dh_install --list-missing71 dh_install --list-missing

Subscribers

People subscribed via source and target branches