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

[Chad Miller]

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)

[Chad Miller (cmiller)]

I picked Bug #442120 to track this change.

[Chad Miller (cmiller)]

> 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> on 2009-12-18

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

=== 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 @@
-Metadata-Version: 1.0
-Name: desktopcouch
-Version: 0.5
-Summary: A Desktop CouchDB instance.
-Home-page: https://launchpad.net/desktopcouch
-Author: Stuart Langridge
-Author-email: [e-mail]
-License: LGPL-3
-Description: UNKNOWN
-Platform: UNKNOWN

=== 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 @@
+desktopcouch (0.5.1-0ubuntu1) karmic; urgency=low
+
+  * New upstream release.
+    + Backported fix of pid-file-exists/open-port timing bug that happens on
+      some machines.  (LP: #442120, #431269, #461114, #465216)
+
+ -- Chad MILLER <[e-mail]>  Fri, 18 Dec 2009 13:37:46 -0500
+
 desktopcouch (0.5-0ubuntu1) karmic; urgency=low
 
   * New upstream release.

=== 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 @@
-Metadata-Version: 1.0
-Name: desktopcouch
-Version: 0.5
-Summary: A Desktop CouchDB instance.
-Home-page: https://launchpad.net/desktopcouch
-Author: Stuart Langridge
-Author-email: [e-mail]
-License: LGPL-3
-Description: UNKNOWN
-Platform: UNKNOWN

=== 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 @@
-COPYING
-COPYING.LESSER
-MANIFEST.in
-README
-desktopcouch-pair.desktop.in
-org.desktopcouch.CouchDB.service
-setup.cfg
-setup.py
-start-desktop-couchdb.sh
-stop-desktop-couchdb.sh
-bin/desktopcouch-pair
-bin/desktopcouch-service
-bin/desktopcouch-stop
-config/desktop-couch/compulsory-auth.ini
-contrib/mocker.py
-data/couchdb.tmpl
-desktopcouch/__init__.py
-desktopcouch/local_files.py
-desktopcouch/replication.py
-desktopcouch/start_local_couchdb.py
-desktopcouch/stop_local_couchdb.py
-desktopcouch.egg-info/PKG-INFO
-desktopcouch.egg-info/SOURCES.txt
-desktopcouch.egg-info/dependency_links.txt
-desktopcouch.egg-info/top_level.txt
-desktopcouch/contacts/__init__.py
-desktopcouch/contacts/contactspicker.py
-desktopcouch/contacts/record.py
-desktopcouch/contacts/schema.txt
-desktopcouch/contacts/testing/__init__.py
-desktopcouch/contacts/testing/create.py
-desktopcouch/contacts/tests/__init__.py
-desktopcouch/contacts/tests/test_contactspicker.py
-desktopcouch/contacts/tests/test_create.py
-desktopcouch/contacts/tests/test_record.py
-desktopcouch/notes/__init__.py
-desktopcouch/notes/record.py
-desktopcouch/pair/__init__.py
-desktopcouch/pair/couchdb_pairing/__init__.py
-desktopcouch/pair/couchdb_pairing/couchdb_io.py
-desktopcouch/pair/couchdb_pairing/dbus_io.py
-desktopcouch/pair/couchdb_pairing/network_io.py
-desktopcouch/pair/tests/__init__.py
-desktopcouch/pair/tests/test_couchdb_io.py
-desktopcouch/pair/tests/test_network_io.py
-desktopcouch/records/__init__.py
-desktopcouch/records/couchgrid.py
-desktopcouch/records/field_registry.py
-desktopcouch/records/record.py
-desktopcouch/records/server.py
-desktopcouch/records/server_base.py
-desktopcouch/records/doc/field_registry.txt
-desktopcouch/records/doc/records.txt
-desktopcouch/records/tests/__init__.py
-desktopcouch/records/tests/test_couchgrid.py
-desktopcouch/records/tests/test_field_registry.py
-desktopcouch/records/tests/test_record.py
-desktopcouch/records/tests/test_server.py
-desktopcouch/replication_services/__init__.py
-desktopcouch/replication_services/example.py
-desktopcouch/replication_services/ubuntuone.py
-desktopcouch/tests/__init__.py
-desktopcouch/tests/test_local_files.py
-desktopcouch/tests/test_start_local_couchdb.py
-docs/man/desktopcouch-pair.1
-po/POTFILES.in
-po/desktopcouch.pot
\ No newline at end of file

=== 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 @@
-

=== 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 @@
-desktopcouch

=== 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 @@
     # give the process a chance to start
     for timeout in xrange(1000):
         pid = read_pidfile()
-        time.sleep(0.3)
         if pid is not None and process_is_couchdb(pid):
             break
-        print "...waiting for couchdb to start..."
+        time.sleep(0.01)
     return pid
 
 def update_design_documents():
@@ -277,7 +276,18 @@
     html = fp.read()
     fp.close()
 
-    port = desktopcouch.find_port(pid=pid)
+    # Loop for a number of times until the port has been found, this
+    # has to be done because there's a slice of time between PID being written
+    # and the listening port being active.
+    port = None
+    for timeout in (0.1, 0.1, 0.2, 0.5, 1, 3, 5, 8):
+        try:
+            port = desktopcouch.find_port(pid=pid) # only returns valid port
+            break
+        except RuntimeError, e:
+            pass
+        time.sleep(timeout)
+
     if port is None:
         print ("We couldn't find desktop-CouchDB's network port.  Bookmark "
                "file not written.")

=== 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 @@
 
 setup(
     name='desktopcouch',
-    version='0.5',
+    version='0.5.1',
     description='A Desktop CouchDB instance.',
     url='https://launchpad.net/desktopcouch',
     license='LGPL-3',