Glance

Merge lp:~dan-prince/glance/nocheck_nodoc into lp:~openstack-ubuntu-packagers/glance/ubuntu

  1. nocheck_nodoc
  2. Merge into ubuntu
Proposed by Dan Prince
Status: Merged
Merged at revision: 31
Proposed branch: lp:~dan-prince/glance/nocheck_nodoc
Merge into: lp:~openstack-ubuntu-packagers/glance/ubuntu
Diff against target: 23 lines (+6/-1)
1 file modified
debian/rules (+6/-1)
To merge this branch: bzr merge lp:~dan-prince/glance/nocheck_nodoc
Reviewer Review Type Date Requested Status
OpenStack Ubuntu packagers Pending
Review via email: mp+60118@code.launchpad.net

Description of the change

Update the glance deb build options so that they support nocheck and nodocs options via 'DEB_BUILD_OPTIONS=nocheck,nodocs'.

To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/rules'
2--- debian/rules 2011-04-12 10:32:30 +0000
3+++ debian/rules 2011-05-05 20:35:56 +0000
4@@ -18,13 +18,18 @@
5 dh_install
6 mv debian/glance/etc/glance/glance.conf.sample debian/glance/etc/glance/glance.conf
7
8+ifeq (,$(findstring nocheck, $(DEB_BUILD_OPTIONS)))
9 override_dh_auto_test:
10 bash run_tests.sh -N
11+endif
12
13 override_dh_auto_build:
14 dh_auto_build
15- mkdir -p doc/build
16+ifeq (,$(findstring nodocs, $(DEB_BUILD_OPTIONS)))
17 python setup.py build_sphinx
18+else
19+ mkdir -p doc/build/html
20+endif
21
22 override_dh_auto_clean:
23 dh_auto_clean

Subscribers

People subscribed via source and target branches