Merge lp:~xnox/oneconf/scripts-and-shebangs into lp:oneconf

Proposed by Dimitri John Ledkov on 2013-01-23
Status: Work in progress
Proposed branch: lp:~xnox/oneconf/scripts-and-shebangs
Merge into: lp:oneconf
Diff against target: 61 lines (+14/-9) 3 files modified
To merge this branch: bzr merge lp:~xnox/oneconf/scripts-and-shebangs
Reviewer Review Type Date Requested Status
Didier Roche 2013-01-23 Needs Fixing on 2013-06-12
Rodney Dawes 2013-01-23 Pending
Review via email: mp+144567@code.launchpad.net
To post a comment you must log in.
Didier Roche (didrocks) wrote :

Hey Dmitrijs!

It seems that Barry didn't get 0.3.3 merged into trunk, do you mind bundling that or coordinate with him?http://launchpadlibrarian.net/129243831/oneconf_0.3.2_0.3.3.diff.gz

Thanks :)

Didier Roche (didrocks) wrote :

setting as WIP meanwhile :)

review: Needs Fixing

Unmerged revisions

270. By Dimitri John Ledkov on 2013-01-23

* debian/rules: skip installing python2 scripts.
* debian/rules: build with python3 first to get correct shebang.
* setup.py: revert 0.3.2 changes.

Preview Diff

1=== modified file 'debian/changelog'
2--- debian/changelog 2013-01-22 19:02:50 +0000
3+++ debian/changelog 2013-01-23 19:37:22 +0000
4@@ -1,3 +1,11 @@
5+oneconf (0.3.3) UNRELEASED; urgency=low
6+
7+ * debian/rules: skip installing python2 scripts.
8+ * debian/rules: build with python3 first to get correct shebang.
9+ * setup.py: revert 0.3.2 changes.
10+
11+ -- Dmitrijs Ledkovs <dmitrij.ledkov@ubuntu.com> Wed, 23 Jan 2013 19:28:42 +0000
12+
13 oneconf (0.3.2) raring; urgency=low
14
15 * setup.py: Only install the command line scripts for Python 3.
16
17=== modified file 'debian/rules'
18--- debian/rules 2013-01-16 03:04:46 +0000
19+++ debian/rules 2013-01-23 19:37:22 +0000
20@@ -7,7 +7,7 @@
21 export http_proxy = http://127.0.9.1:9
22
23 PYTHON2=$(shell pyversions -vr)
24-PYTHON3=$(shell py3versions -vr)
25+PYTHON3=3 $(shell py3versions -vr)
26
27 %:
28 dh $@ --with python2,python3
29@@ -36,7 +36,7 @@
30 python$* setup.py install --root=$(CURDIR)/debian/tmp --install-layout=deb
31
32 override_dh_auto_install: $(PYTHON3:%=install-python%)
33- dh_auto_install
34+ dh_auto_install -- --install-scripts skip && rm -rf debian/tmp/skip
35 # Move the scripts to $(SHARE) and relink some again later. The
36 # scripts will be included in the "oneconf" binary package
37 mkdir -p debian/oneconf/$(share)
38
39=== modified file 'setup.py'
40--- setup.py 2013-01-22 19:02:50 +0000
41+++ setup.py 2013-01-23 19:37:22 +0000
42@@ -42,15 +42,12 @@
43 Exec=%s
44 """ % oneconf_service_path)
45
46-# The scripts only work with Python 3.
47-if sys.version_info[0] == 3:
48- scripts = ['oneconf-query', 'oneconf-service', 'misc/oneconf-update']
49-else:
50- scripts = []
51-
52 # real setup
53 setup(name="oneconf", version=VERSION,
54- scripts=scripts,
55+ scripts=["oneconf-query",
56+ "oneconf-service",
57+ "misc/oneconf-update",
58+ ],
59 packages = ['oneconf',
60 'oneconf.distributor',
61 'oneconf.networksync',

Subscribers

People subscribed via source and target branches