diff -Nru ubuntuone-indicator-0.0.10+r66~natty/.bzr/branch/last-revision ubuntuone-indicator-0.0.11+r67~natty/.bzr/branch/last-revision --- ubuntuone-indicator-0.0.10+r66~natty/.bzr/branch/last-revision 2011-04-12 08:46:51.000000000 +0000 +++ ubuntuone-indicator-0.0.11+r67~natty/.bzr/branch/last-revision 2011-06-20 09:19:55.000000000 +0000 @@ -1 +1 @@ -66 roman.yepishev@canonical.com-20110412074555-oj1upeysqq5zyfm6 +67 roman.yepishev@canonical.com-20110620091325-nav4vj9mpemg9iy0 Binary files /tmp/ROZ3xjvsVR/ubuntuone-indicator-0.0.10+r66~natty/.bzr/checkout/dirstate and /tmp/U9cY8tDWfd/ubuntuone-indicator-0.0.11+r67~natty/.bzr/checkout/dirstate differ diff -Nru ubuntuone-indicator-0.0.10+r66~natty/.bzr/repository/indices/f77111ca74afe4224cb0cd1ca2e085dc.cix ubuntuone-indicator-0.0.11+r67~natty/.bzr/repository/indices/f77111ca74afe4224cb0cd1ca2e085dc.cix --- ubuntuone-indicator-0.0.10+r66~natty/.bzr/repository/indices/f77111ca74afe4224cb0cd1ca2e085dc.cix 1970-01-01 00:00:00.000000000 +0000 +++ ubuntuone-indicator-0.0.11+r67~natty/.bzr/repository/indices/f77111ca74afe4224cb0cd1ca2e085dc.cix 2011-06-20 09:19:55.000000000 +0000 @@ -0,0 +1,6 @@ +B+Tree Graph Index 2 +node_ref_lists=0 +key_elements=1 +len=1 +row_lengths=1 +x 1 PfN~K)`a88MysxAK'giSV9[D`–8EGRNH\j$K \ No newline at end of file Binary files /tmp/ROZ3xjvsVR/ubuntuone-indicator-0.0.10+r66~natty/.bzr/repository/indices/f77111ca74afe4224cb0cd1ca2e085dc.iix and /tmp/U9cY8tDWfd/ubuntuone-indicator-0.0.11+r67~natty/.bzr/repository/indices/f77111ca74afe4224cb0cd1ca2e085dc.iix differ Binary files /tmp/ROZ3xjvsVR/ubuntuone-indicator-0.0.10+r66~natty/.bzr/repository/indices/f77111ca74afe4224cb0cd1ca2e085dc.rix and /tmp/U9cY8tDWfd/ubuntuone-indicator-0.0.11+r67~natty/.bzr/repository/indices/f77111ca74afe4224cb0cd1ca2e085dc.rix differ diff -Nru ubuntuone-indicator-0.0.10+r66~natty/.bzr/repository/indices/f77111ca74afe4224cb0cd1ca2e085dc.six ubuntuone-indicator-0.0.11+r67~natty/.bzr/repository/indices/f77111ca74afe4224cb0cd1ca2e085dc.six --- ubuntuone-indicator-0.0.10+r66~natty/.bzr/repository/indices/f77111ca74afe4224cb0cd1ca2e085dc.six 1970-01-01 00:00:00.000000000 +0000 +++ ubuntuone-indicator-0.0.11+r67~natty/.bzr/repository/indices/f77111ca74afe4224cb0cd1ca2e085dc.six 2011-06-20 09:19:55.000000000 +0000 @@ -0,0 +1,5 @@ +B+Tree Graph Index 2 +node_ref_lists=0 +key_elements=1 +len=0 +row_lengths= Binary files /tmp/ROZ3xjvsVR/ubuntuone-indicator-0.0.10+r66~natty/.bzr/repository/indices/f77111ca74afe4224cb0cd1ca2e085dc.tix and /tmp/U9cY8tDWfd/ubuntuone-indicator-0.0.11+r67~natty/.bzr/repository/indices/f77111ca74afe4224cb0cd1ca2e085dc.tix differ Binary files /tmp/ROZ3xjvsVR/ubuntuone-indicator-0.0.10+r66~natty/.bzr/repository/pack-names and /tmp/U9cY8tDWfd/ubuntuone-indicator-0.0.11+r67~natty/.bzr/repository/pack-names differ Binary files /tmp/ROZ3xjvsVR/ubuntuone-indicator-0.0.10+r66~natty/.bzr/repository/packs/f77111ca74afe4224cb0cd1ca2e085dc.pack and /tmp/U9cY8tDWfd/ubuntuone-indicator-0.0.11+r67~natty/.bzr/repository/packs/f77111ca74afe4224cb0cd1ca2e085dc.pack differ Binary files /tmp/ROZ3xjvsVR/ubuntuone-indicator-0.0.10+r66~natty/debian/.bzr/checkout/dirstate and /tmp/U9cY8tDWfd/ubuntuone-indicator-0.0.11+r67~natty/debian/.bzr/checkout/dirstate differ diff -Nru ubuntuone-indicator-0.0.10+r66~natty/debian/changelog ubuntuone-indicator-0.0.11+r67~natty/debian/changelog --- ubuntuone-indicator-0.0.10+r66~natty/debian/changelog 2011-04-12 08:46:52.000000000 +0000 +++ ubuntuone-indicator-0.0.11+r67~natty/debian/changelog 2011-06-20 09:19:56.000000000 +0000 @@ -1,4 +1,11 @@ -ubuntuone-indicator (0.0.10+r66~natty) natty; urgency=low +ubuntuone-indicator (0.0.11+r67~natty) natty; urgency=low + + * New release: + - Do not break on new waiting() format (LP:799644) + + -- Roman Yepishev Mon, 20 Jun 2011 12:16:54 +0300 + +ubuntuone-indicator (0.0.10+r66~maverick) maverick; urgency=low * New release: - Do not crash on unresponsive SD (LP:751356) @@ -9,7 +16,7 @@ - Start using waiting call instead of waiting_metadata and waiting_content to stop spamming syncdaemon logs - -- Roman Yepishev Tue, 12 Apr 2011 10:42:09 +0300 + -- Roman Yepishev Mon, 20 Jun 2011 12:16:15 +0300 ubuntuone-indicator (0.0.9+r60~natty) natty; urgency=low diff -Nru ubuntuone-indicator-0.0.10+r66~natty/ubuntuone_indicator/__init__.py ubuntuone-indicator-0.0.11+r67~natty/ubuntuone_indicator/__init__.py --- ubuntuone-indicator-0.0.10+r66~natty/ubuntuone_indicator/__init__.py 2011-04-12 08:46:51.000000000 +0000 +++ ubuntuone-indicator-0.0.11+r67~natty/ubuntuone_indicator/__init__.py 2011-06-20 09:19:55.000000000 +0000 @@ -267,16 +267,23 @@ if self.unleashed_q: data = self.status_if.waiting() for item in data: - if item[0] in CONTENT_QUEUE_OPS: + # old SD: op, data + # new SD: op, id, data + operation = item[0] + data = item[1] + if len(item) > 2: + data = item[2] + + if operation in CONTENT_QUEUE_OPS: if not content: continue - entry = {'operation': item[0], - 'path': item[1].get('path', ''), - 'size': item[1].get('size', None)} + entry = {'operation': operation, + 'path': data.get('path', ''), + 'size': data.get('size', None)} result.append(entry) if meta: # we are not interested in anything else for now - entry = {'operation': item[0]} + entry = {'operation': operation} result.append(entry) else: if meta: