lp://qastaging/~fginther/landscape-client/fix-missing-install-dirs
- Get this branch:
- bzr branch lp://qastaging/~fginther/landscape-client/fix-missing-install-dirs
Branch merges
- Eric Snow (community): Approve
- Andreas Hasenack: Approve
- 🤖 Landscape Builder: Approve (test results)
-
Diff: 34 lines (+7/-5)3 files modifieddebian/landscape-common.dirs (+3/-0)
debian/landscape-common3.dirs (+3/-0)
debian/rules (+1/-5)
Related bugs
Bug #1680842: mktemp error when installing client from scratch | High | Fix Committed |
Related blueprints
Branch information
Recent revisions
- 1008. By Francis Ginther
-
Fix missing install directories for landscape-common3 and drop usr/share/landscape as its only used and created by landscape-client.
- 1007. By Eric Snow
-
Merge fix-1680560-
fix-db- package [f=1680560,1680601] [r=blackboxsw] [a=ericsnowcurr ently] Fix the debian packaging.
(fixes lp:1680560)
There were several problems, including unhelpful symlinks, landscape-common installed under Python 3, and conflicts
over the same file.For now I've marked the two landscape-common packages as CONFLICTS, but
really they should become python2-landscape and python3-landscape, and
the actual common stuff should go into landscape-common. However, that
can wait. - 1006. By Free Ekanayaka
-
Merge py3-registration [f=] [r=landscape-
builder, simpoir, ericsnowcurrent ly] [a=Free Ekanayaka]
Adjust wire-to-language type conversions in order to have Landscape registration work. - 1004. By Steffen Allner
-
Merge fetch-returns-
bytes-in- tests [f=] [r=simpoir, ericsnowcurrent ly,landscape- builder] [a=Gocept]
Return bytes from mocks of landscape.lib.fetch. fetch() . In this MP an inconsistency between tests and actual implementation was fixed. The landscape.
lib.fetch. fetch() returns bytes now explicitly, but this was not reflected in the mocks used throughout the landscape-client project. I tried to convert all return values of the mocks to bytes and adjusted the tests accordingly.
- 1003. By Steffen Allner
-
Merge py3-cleanup [f=] [r=ericsnowcurr
ently,landscape -builder, nilo] [a=Gocept]
Cleanups related to landscape.compat (and lint).This MP cleans up small residues from the port to Python 2/3 compatibility. It removes the unwanted coerce_unicode() helper method, which was replaced by individual solutions at the respective place of use. Furthermore unused imports have been removed and the usage (c)StringIO has been investigated, whether it could be replaced by a common io.{String,
Bytes}IO( ) call in Python 2 and 3. This was often not the case, as this was also connected with the logging setup in the tests, which should not be addressed here. - 1002. By Eric Snow
-
Merge fix-test-
race-sys- argv [f=1677630] [r=free. ekanayaka, simpoir] [a=Eric Snow]
his patch fixes a race condition in tests involving sys.argv.Under certain load conditions there is a collision on patched-out
sys.argv. To resolve this, we switch to using the config to store the
bindir that should be used (rather than extrapolating from sys.argv[0]). - 1001. By Steffen Allner
-
Merge raise-error-
on-signal [f=] [r=ericsnowcurr ently,landscape -builder, nilo] [a=Gocept]
"Raise" a new SignalError from AllOutputProcessProtocol. processEnded( ). The exception is propagated through reactor.errback() rather than actually raised. SignalError happens when a twisted-spawned process exits due to a signal. This is a necessary change because of how twisted errbacks are handled in Python 3. However, it is also a valid change for Python 2 since errbacks align with exceptions, not tuples.
- 1000. By Steffen Allner
-
Merge py3-startup [f=] [r=nilo,
ack,free. ekanayaka, landscape- builder] [a=Gocept]
This MP allows to startup the client as there has been an issue with writing bytes to the stdout/stderr with the watchdog.Additionally, I included a hacky workaround to convert all keys in dictionaries to unicode, when they are retrieved from a bpickled stream of data, and to write them back as bytes when bpickle.dumps().
If this is accepted that should be included in the bpickle git repository.
- 999. By Steffen Allner
-
Merge py3-packages [f=] [r=free.
ekanayaka, ericsnowcurrent ly,landscape- builder] [a=Gocept]
Add the landscape-common3 deb package and use it in landscape-client.This MP changes the debian package build configuration of the project to build a Python 3 driven landscape-client package. This is facilitated through a new landscape-common3 package. The existing landscape-common package, based on Python 2, remains unchanged.
Branch metadata
- Branch format:
- Branch format 7
- Repository format:
- Bazaar repository format 2a (needs bzr 1.16 or later)
- Stacked on:
- lp://qastaging/~landscape/landscape-client/trunk