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
=== removed file 'PKG-INFO'
--- PKG-INFO 2009-10-22 17:15:57 +0000
+++ PKG-INFO 1970-01-01 00:00:00 +0000
@@ -1,10 +0,0 @@
1Metadata-Version: 1.0
2Name: desktopcouch
3Version: 0.5
4Summary: A Desktop CouchDB instance.
5Home-page: https://launchpad.net/desktopcouch
6Author: Stuart Langridge
7Author-email: stuart.langridge@canonical.com
8License: LGPL-3
9Description: UNKNOWN
10Platform: UNKNOWN
110
=== modified file 'debian/changelog'
--- debian/changelog 2009-10-22 17:15:57 +0000
+++ debian/changelog 2009-12-21 15:24:20 +0000
@@ -1,3 +1,11 @@
1desktopcouch (0.5.1-0ubuntu1) karmic; urgency=low
2
3 * New upstream release.
4 + Backported fix of pid-file-exists/open-port timing bug that happens on
5 some machines. (LP: #442120, #431269, #461114, #465216)
6
7 -- Chad MILLER <chad.miller@canonical.com> Fri, 18 Dec 2009 13:37:46 -0500
8
1desktopcouch (0.5-0ubuntu1) karmic; urgency=low9desktopcouch (0.5-0ubuntu1) karmic; urgency=low
210
3 * New upstream release.11 * New upstream release.
412
=== removed directory 'desktopcouch.egg-info'
=== removed file 'desktopcouch.egg-info/PKG-INFO'
--- desktopcouch.egg-info/PKG-INFO 2009-10-22 17:15:57 +0000
+++ desktopcouch.egg-info/PKG-INFO 1970-01-01 00:00:00 +0000
@@ -1,10 +0,0 @@
1Metadata-Version: 1.0
2Name: desktopcouch
3Version: 0.5
4Summary: A Desktop CouchDB instance.
5Home-page: https://launchpad.net/desktopcouch
6Author: Stuart Langridge
7Author-email: stuart.langridge@canonical.com
8License: LGPL-3
9Description: UNKNOWN
10Platform: UNKNOWN
110
=== removed file 'desktopcouch.egg-info/SOURCES.txt'
--- desktopcouch.egg-info/SOURCES.txt 2009-10-22 17:15:57 +0000
+++ desktopcouch.egg-info/SOURCES.txt 1970-01-01 00:00:00 +0000
@@ -1,67 +0,0 @@
1COPYING
2COPYING.LESSER
3MANIFEST.in
4README
5desktopcouch-pair.desktop.in
6org.desktopcouch.CouchDB.service
7setup.cfg
8setup.py
9start-desktop-couchdb.sh
10stop-desktop-couchdb.sh
11bin/desktopcouch-pair
12bin/desktopcouch-service
13bin/desktopcouch-stop
14config/desktop-couch/compulsory-auth.ini
15contrib/mocker.py
16data/couchdb.tmpl
17desktopcouch/__init__.py
18desktopcouch/local_files.py
19desktopcouch/replication.py
20desktopcouch/start_local_couchdb.py
21desktopcouch/stop_local_couchdb.py
22desktopcouch.egg-info/PKG-INFO
23desktopcouch.egg-info/SOURCES.txt
24desktopcouch.egg-info/dependency_links.txt
25desktopcouch.egg-info/top_level.txt
26desktopcouch/contacts/__init__.py
27desktopcouch/contacts/contactspicker.py
28desktopcouch/contacts/record.py
29desktopcouch/contacts/schema.txt
30desktopcouch/contacts/testing/__init__.py
31desktopcouch/contacts/testing/create.py
32desktopcouch/contacts/tests/__init__.py
33desktopcouch/contacts/tests/test_contactspicker.py
34desktopcouch/contacts/tests/test_create.py
35desktopcouch/contacts/tests/test_record.py
36desktopcouch/notes/__init__.py
37desktopcouch/notes/record.py
38desktopcouch/pair/__init__.py
39desktopcouch/pair/couchdb_pairing/__init__.py
40desktopcouch/pair/couchdb_pairing/couchdb_io.py
41desktopcouch/pair/couchdb_pairing/dbus_io.py
42desktopcouch/pair/couchdb_pairing/network_io.py
43desktopcouch/pair/tests/__init__.py
44desktopcouch/pair/tests/test_couchdb_io.py
45desktopcouch/pair/tests/test_network_io.py
46desktopcouch/records/__init__.py
47desktopcouch/records/couchgrid.py
48desktopcouch/records/field_registry.py
49desktopcouch/records/record.py
50desktopcouch/records/server.py
51desktopcouch/records/server_base.py
52desktopcouch/records/doc/field_registry.txt
53desktopcouch/records/doc/records.txt
54desktopcouch/records/tests/__init__.py
55desktopcouch/records/tests/test_couchgrid.py
56desktopcouch/records/tests/test_field_registry.py
57desktopcouch/records/tests/test_record.py
58desktopcouch/records/tests/test_server.py
59desktopcouch/replication_services/__init__.py
60desktopcouch/replication_services/example.py
61desktopcouch/replication_services/ubuntuone.py
62desktopcouch/tests/__init__.py
63desktopcouch/tests/test_local_files.py
64desktopcouch/tests/test_start_local_couchdb.py
65docs/man/desktopcouch-pair.1
66po/POTFILES.in
67po/desktopcouch.pot
68\ No newline at end of file0\ No newline at end of file
691
=== removed file 'desktopcouch.egg-info/dependency_links.txt'
--- desktopcouch.egg-info/dependency_links.txt 2009-10-22 17:15:57 +0000
+++ desktopcouch.egg-info/dependency_links.txt 1970-01-01 00:00:00 +0000
@@ -1,1 +0,0 @@
1
20
=== removed file 'desktopcouch.egg-info/top_level.txt'
--- desktopcouch.egg-info/top_level.txt 2009-10-22 17:15:57 +0000
+++ desktopcouch.egg-info/top_level.txt 1970-01-01 00:00:00 +0000
@@ -1,1 +0,0 @@
1desktopcouch
20
=== modified file 'desktopcouch/start_local_couchdb.py'
--- desktopcouch/start_local_couchdb.py 2009-10-22 17:15:57 +0000
+++ desktopcouch/start_local_couchdb.py 2009-12-21 15:24:20 +0000
@@ -210,10 +210,9 @@
210 # give the process a chance to start210 # give the process a chance to start
211 for timeout in xrange(1000):211 for timeout in xrange(1000):
212 pid = read_pidfile()212 pid = read_pidfile()
213 time.sleep(0.3)
214 if pid is not None and process_is_couchdb(pid):213 if pid is not None and process_is_couchdb(pid):
215 break214 break
216 print "...waiting for couchdb to start..."215 time.sleep(0.01)
217 return pid216 return pid
218217
219def update_design_documents():218def update_design_documents():
@@ -277,7 +276,18 @@
277 html = fp.read()276 html = fp.read()
278 fp.close()277 fp.close()
279278
280 port = desktopcouch.find_port(pid=pid)279 # Loop for a number of times until the port has been found, this
280 # has to be done because there's a slice of time between PID being written
281 # and the listening port being active.
282 port = None
283 for timeout in (0.1, 0.1, 0.2, 0.5, 1, 3, 5, 8):
284 try:
285 port = desktopcouch.find_port(pid=pid) # only returns valid port
286 break
287 except RuntimeError, e:
288 pass
289 time.sleep(timeout)
290
281 if port is None:291 if port is None:
282 print ("We couldn't find desktop-CouchDB's network port. Bookmark "292 print ("We couldn't find desktop-CouchDB's network port. Bookmark "
283 "file not written.")293 "file not written.")
284294
=== modified file 'setup.py'
--- setup.py 2009-10-22 17:15:57 +0000
+++ setup.py 2009-12-21 15:24:20 +0000
@@ -22,7 +22,7 @@
2222
23setup(23setup(
24 name='desktopcouch',24 name='desktopcouch',
25 version='0.5',25 version='0.5.1',
26 description='A Desktop CouchDB instance.',26 description='A Desktop CouchDB instance.',
27 url='https://launchpad.net/desktopcouch',27 url='https://launchpad.net/desktopcouch',
28 license='LGPL-3',28 license='LGPL-3',

Subscribers

People subscribed via source and target branches