Landscape Client

Merge lp:~fginther/landscape-client/fix-missing-install-dirs into lp:~landscape/landscape-client/trunk

  1. fix-missing-install-dirs
  2. Merge into trunk
Proposed by Francis Ginther
Status: Merged
Approved by: Francis Ginther
Approved revision: 1008
Merged at revision: 1008
Proposed branch: lp:~fginther/landscape-client/fix-missing-install-dirs
Merge into: lp:~landscape/landscape-client/trunk
Diff against target: 34 lines (+7/-5)
3 files modified
debian/landscape-common.dirs (+3/-0)
debian/landscape-common3.dirs (+3/-0)
debian/rules (+1/-5)
To merge this branch: bzr merge lp:~fginther/landscape-client/fix-missing-install-dirs
Reviewer Review Type Date Requested Status
Eric Snow (community) Approve
Andreas Hasenack Approve
🤖 Landscape Builder test results Approve
Review via email: mp+322223@code.launchpad.net

Commit message

Fix missing install directories for landscape-common3 and drop usr/share/landscape as its only used and created by landscape-client.

Description of the change

Fix missing install directories for landscape-common3 and drop usr/share/landscape as its only used and created by landscape-client.

Build a package:
 - dpkg-buildpackage -b -rfakeroot -us -uc

Then install landscape-common3 and landscape-client onto a pristine xenial instance or lxd. The packages should install without error.

To post a comment you must log in.
Revision history for this message
🤖 Landscape Builder (landscape-builder) :
review: Abstain (executing tests)
Revision history for this message
🤖 Landscape Builder (landscape-builder) wrote :

Command: TRIAL_ARGS=-j4 make ci-check
Result: Success
Revno: 1008
Branch: lp:~fginther/landscape-client/fix-missing-install-dirs
Jenkins: https://ci.lscape.net/job/latch-test-xenial/3860/

review: Approve (test results)
Revision history for this message
Andreas Hasenack (ahasenack) wrote :

+1, packages built and installed fine, and landscape-client also runs correctly with -common3.

review: Approve
Revision history for this message
Eric Snow (ericsnowcurrently) wrote :

LGTM

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/landscape-common.dirs'
2--- debian/landscape-common.dirs 2017-04-04 13:46:49 +0000
3+++ debian/landscape-common.dirs 2017-04-07 18:54:02 +0000
4@@ -1,1 +1,4 @@
5 etc/update-motd.d
6+etc/landscape
7+var/lib/landscape
8+var/log/landscape
9
10=== modified file 'debian/landscape-common3.dirs'
11--- debian/landscape-common3.dirs 2017-04-06 20:59:56 +0000
12+++ debian/landscape-common3.dirs 2017-04-07 18:54:02 +0000
13@@ -1,1 +1,4 @@
14 etc/update-motd.d
15+etc/landscape
16+var/lib/landscape
17+var/log/landscape
18
19=== modified file 'debian/rules'
20--- debian/rules 2017-04-06 21:08:46 +0000
21+++ debian/rules 2017-04-07 18:54:02 +0000
22@@ -47,11 +47,7 @@
23 dh_testdir
24 dh_testroot
25 dh_prep
26- dh_installdirs \
27- etc/landscape \
28- var/lib/landscape \
29- var/log/landscape \
30- usr/share/landscape
31+ dh_installdirs
32
33 python2 setup.py install --root $(root_dir) $(py_setup_install_args)
34 python3 setup.py install --root $(root_dir) $(py_setup_install_args)

Subscribers

People subscribed via source and target branches

to all changes: