← Back to branch summary

~didrocks/ubuntuone-client/dont-suffer-zg-crash

« back to all changes in this revision

Viewing changes to bin/u1sdtool

  • Committer: Bazaar Package Importer
  • Author(s): Rodney Dawes
  • Date: 2011-02-11 16:18:11 UTC
  • mfrom: (1.1.44 upstream)
  • Revision ID: james.westby@ubuntu.com-20110211161811-lbelxu332e8r2dov
Tags: 1.5.4-0ubuntu1
https://launchpad.net/bugs/682878
https://launchpad.net/bugs/708335
https://launchpad.net/bugs/712674
https://launchpad.net/bugs/715776
https://launchpad.net/bugs/702055
https://launchpad.net/bugs/702075
https://launchpad.net/bugs/702128
https://launchpad.net/bugs/702138
https://launchpad.net/bugs/702144
* New upstream release.
  - Files still get downloaded from unsubscribed folder (LP: #682878)
  - Add subscription capabilities to shares (LP: #708335)
  - Nautilus offers Publish option within other's shares (LP: #712674)
  - Shares dir name may not be unique (LP: #715776)
  - Send a notification when new Volume is available (LP: #702055)
  - Add messaging menu entry for new Volumes (LP: #702075)
  - Aggregate notifications for completed operations (LP: #702128)
  - Send a notification for new Share offers (LP: #702138)
  - Add messaging menu entry for new Share offers (LP: #702144)
* Remove ubuntuone-client-tools as u1sync has been moved out.
* Simplify python package as we don't have multiple python packages now.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bin/u1sdtool
96
96
        d = sync_daemon_tool.accept_share(options.accept_share)
97
97
    elif options.reject_share:
98
98
        d = sync_daemon_tool.reject_share(options.reject_share)
 
99
    elif options.subscribe_share:
 
100
        d = sync_daemon_tool.subscribe_share(options.subscribe_share)
 
101
        d.addErrback(lambda r: show_error(r, out))
 
102
    elif options.unsubscribe_share:
 
103
        d = sync_daemon_tool.unsubscribe_share(options.unsubscribe_share)
 
104
        d.addErrback(lambda r: show_error(r, out))
99
105
    elif options.refresh_shares:
100
106
        d = sync_daemon_tool.refresh_shares()
101
107
    elif options.refresh_volumes:
200
206
    parser.add_option("", "--list-shares", dest="list_shares",
201
207
                      action="store_true",
202
208
                      help="Get the list of shares")
 
209
    parser.add_option("", "--subscribe-share", dest="subscribe_share",
 
210
                      metavar="SHARE_ID",
 
211
                      help="Subscribe to a share specified by id")
 
212
    parser.add_option("", "--unsubscribe-share", dest="unsubscribe_share",
 
213
                      metavar="SHARE_ID",
 
214
                      help="Unsubscribe from a share specified by id")
203
215
    parser.add_option("", "--refresh-shares", dest="refresh_shares",
204
216
                      action="store_true",
205
217
                      help="Request a refresh of the list of shares to"