Ubuntu
desktopcouch package

Merge lp:~ubuntuone-control-tower/ubuntu/karmic/desktopcouch/release-0.5.1 into lp:ubuntu/karmic/desktopcouch

  1. Karmic (9.10)
  2. release-0.5.1
  3. Merge into karmic
Proposed by Chad Miller
Status: Rejected
Rejected by: Steve Langasek
Proposed branch: lp:~ubuntuone-control-tower/ubuntu/karmic/desktopcouch/release-0.5.1
Merge into: lp:ubuntu/karmic/desktopcouch
Diff against target: 180 lines (+22/-93)
8 files modified
PKG-INFO (+0/-10)
debian/changelog (+8/-0)
desktopcouch.egg-info/PKG-INFO (+0/-10)
desktopcouch.egg-info/SOURCES.txt (+0/-67)
desktopcouch.egg-info/dependency_links.txt (+0/-1)
desktopcouch.egg-info/top_level.txt (+0/-1)
desktopcouch/start_local_couchdb.py (+13/-3)
setup.py (+1/-1)
To merge this branch: bzr merge lp:~ubuntuone-control-tower/ubuntu/karmic/desktopcouch/release-0.5.1
Reviewer Review Type Date Requested Status
Ubuntu Stable Release Updates Team Pending
Review via email: mp+16433@code.launchpad.net

Commit message

New upstream release, 0.5.1: Backported fix of pid-file-exists/open-port timing bug that happens on some machines. (LP: #442120, #431269, #461114, #465216)

To post a comment you must log in.
Revision history for this message
Chad Miller (cmiller) wrote :

I picked Bug #442120 to track this change.

Revision history for this message
Chad Miller (cmiller) wrote :

> I picked Bug #442120 to track this change.

Oops. Er, but nominated for Karmic in #465216.

Unmerged revisions

11. By C Miller <email address hidden>

* New upstream release.
  + Backported fix of pid-file-exists/open-port timing bug that happens on
    some machines. (LP: #442120, #431269, #461114, #465216)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== removed file 'PKG-INFO'
2--- PKG-INFO 2009-10-22 17:15:57 +0000
3+++ PKG-INFO 1970-01-01 00:00:00 +0000
4@@ -1,10 +0,0 @@
5-Metadata-Version: 1.0
6-Name: desktopcouch
7-Version: 0.5
8-Summary: A Desktop CouchDB instance.
9-Home-page: https://launchpad.net/desktopcouch
10-Author: Stuart Langridge
11-Author-email: stuart.langridge@canonical.com
12-License: LGPL-3
13-Description: UNKNOWN
14-Platform: UNKNOWN
15
16=== modified file 'debian/changelog'
17--- debian/changelog 2009-10-22 17:15:57 +0000
18+++ debian/changelog 2009-12-21 15:24:20 +0000
19@@ -1,3 +1,11 @@
20+desktopcouch (0.5.1-0ubuntu1) karmic; urgency=low
21+
22+ * New upstream release.
23+ + Backported fix of pid-file-exists/open-port timing bug that happens on
24+ some machines. (LP: #442120, #431269, #461114, #465216)
25+
26+ -- Chad MILLER <chad.miller@canonical.com> Fri, 18 Dec 2009 13:37:46 -0500
27+
28 desktopcouch (0.5-0ubuntu1) karmic; urgency=low
29
30 * New upstream release.
31
32=== removed directory 'desktopcouch.egg-info'
33=== removed file 'desktopcouch.egg-info/PKG-INFO'
34--- desktopcouch.egg-info/PKG-INFO 2009-10-22 17:15:57 +0000
35+++ desktopcouch.egg-info/PKG-INFO 1970-01-01 00:00:00 +0000
36@@ -1,10 +0,0 @@
37-Metadata-Version: 1.0
38-Name: desktopcouch
39-Version: 0.5
40-Summary: A Desktop CouchDB instance.
41-Home-page: https://launchpad.net/desktopcouch
42-Author: Stuart Langridge
43-Author-email: stuart.langridge@canonical.com
44-License: LGPL-3
45-Description: UNKNOWN
46-Platform: UNKNOWN
47
48=== removed file 'desktopcouch.egg-info/SOURCES.txt'
49--- desktopcouch.egg-info/SOURCES.txt 2009-10-22 17:15:57 +0000
50+++ desktopcouch.egg-info/SOURCES.txt 1970-01-01 00:00:00 +0000
51@@ -1,67 +0,0 @@
52-COPYING
53-COPYING.LESSER
54-MANIFEST.in
55-README
56-desktopcouch-pair.desktop.in
57-org.desktopcouch.CouchDB.service
58-setup.cfg
59-setup.py
60-start-desktop-couchdb.sh
61-stop-desktop-couchdb.sh
62-bin/desktopcouch-pair
63-bin/desktopcouch-service
64-bin/desktopcouch-stop
65-config/desktop-couch/compulsory-auth.ini
66-contrib/mocker.py
67-data/couchdb.tmpl
68-desktopcouch/__init__.py
69-desktopcouch/local_files.py
70-desktopcouch/replication.py
71-desktopcouch/start_local_couchdb.py
72-desktopcouch/stop_local_couchdb.py
73-desktopcouch.egg-info/PKG-INFO
74-desktopcouch.egg-info/SOURCES.txt
75-desktopcouch.egg-info/dependency_links.txt
76-desktopcouch.egg-info/top_level.txt
77-desktopcouch/contacts/__init__.py
78-desktopcouch/contacts/contactspicker.py
79-desktopcouch/contacts/record.py
80-desktopcouch/contacts/schema.txt
81-desktopcouch/contacts/testing/__init__.py
82-desktopcouch/contacts/testing/create.py
83-desktopcouch/contacts/tests/__init__.py
84-desktopcouch/contacts/tests/test_contactspicker.py
85-desktopcouch/contacts/tests/test_create.py
86-desktopcouch/contacts/tests/test_record.py
87-desktopcouch/notes/__init__.py
88-desktopcouch/notes/record.py
89-desktopcouch/pair/__init__.py
90-desktopcouch/pair/couchdb_pairing/__init__.py
91-desktopcouch/pair/couchdb_pairing/couchdb_io.py
92-desktopcouch/pair/couchdb_pairing/dbus_io.py
93-desktopcouch/pair/couchdb_pairing/network_io.py
94-desktopcouch/pair/tests/__init__.py
95-desktopcouch/pair/tests/test_couchdb_io.py
96-desktopcouch/pair/tests/test_network_io.py
97-desktopcouch/records/__init__.py
98-desktopcouch/records/couchgrid.py
99-desktopcouch/records/field_registry.py
100-desktopcouch/records/record.py
101-desktopcouch/records/server.py
102-desktopcouch/records/server_base.py
103-desktopcouch/records/doc/field_registry.txt
104-desktopcouch/records/doc/records.txt
105-desktopcouch/records/tests/__init__.py
106-desktopcouch/records/tests/test_couchgrid.py
107-desktopcouch/records/tests/test_field_registry.py
108-desktopcouch/records/tests/test_record.py
109-desktopcouch/records/tests/test_server.py
110-desktopcouch/replication_services/__init__.py
111-desktopcouch/replication_services/example.py
112-desktopcouch/replication_services/ubuntuone.py
113-desktopcouch/tests/__init__.py
114-desktopcouch/tests/test_local_files.py
115-desktopcouch/tests/test_start_local_couchdb.py
116-docs/man/desktopcouch-pair.1
117-po/POTFILES.in
118-po/desktopcouch.pot
119\ No newline at end of file
120
121=== removed file 'desktopcouch.egg-info/dependency_links.txt'
122--- desktopcouch.egg-info/dependency_links.txt 2009-10-22 17:15:57 +0000
123+++ desktopcouch.egg-info/dependency_links.txt 1970-01-01 00:00:00 +0000
124@@ -1,1 +0,0 @@
125-
126
127=== removed file 'desktopcouch.egg-info/top_level.txt'
128--- desktopcouch.egg-info/top_level.txt 2009-10-22 17:15:57 +0000
129+++ desktopcouch.egg-info/top_level.txt 1970-01-01 00:00:00 +0000
130@@ -1,1 +0,0 @@
131-desktopcouch
132
133=== modified file 'desktopcouch/start_local_couchdb.py'
134--- desktopcouch/start_local_couchdb.py 2009-10-22 17:15:57 +0000
135+++ desktopcouch/start_local_couchdb.py 2009-12-21 15:24:20 +0000
136@@ -210,10 +210,9 @@
137 # give the process a chance to start
138 for timeout in xrange(1000):
139 pid = read_pidfile()
140- time.sleep(0.3)
141 if pid is not None and process_is_couchdb(pid):
142 break
143- print "...waiting for couchdb to start..."
144+ time.sleep(0.01)
145 return pid
146
147 def update_design_documents():
148@@ -277,7 +276,18 @@
149 html = fp.read()
150 fp.close()
151
152- port = desktopcouch.find_port(pid=pid)
153+ # Loop for a number of times until the port has been found, this
154+ # has to be done because there's a slice of time between PID being written
155+ # and the listening port being active.
156+ port = None
157+ for timeout in (0.1, 0.1, 0.2, 0.5, 1, 3, 5, 8):
158+ try:
159+ port = desktopcouch.find_port(pid=pid) # only returns valid port
160+ break
161+ except RuntimeError, e:
162+ pass
163+ time.sleep(timeout)
164+
165 if port is None:
166 print ("We couldn't find desktop-CouchDB's network port. Bookmark "
167 "file not written.")
168
169=== modified file 'setup.py'
170--- setup.py 2009-10-22 17:15:57 +0000
171+++ setup.py 2009-12-21 15:24:20 +0000
172@@ -22,7 +22,7 @@
173
174 setup(
175 name='desktopcouch',
176- version='0.5',
177+ version='0.5.1',
178 description='A Desktop CouchDB instance.',
179 url='https://launchpad.net/desktopcouch',
180 license='LGPL-3',

Subscribers

People subscribed via source and target branches