Merge lp:~brunonova/oneconf/lp1165104 into lp:oneconf
Status: | Merged |
---|---|
Merged at revision: | 275 |
Proposed branch: | lp:~brunonova/oneconf/lp1165104 |
Merge into: | lp:oneconf |
Diff against target: |
50 lines (+8/-3) 3 files modified
oneconf/networksync/__init__.py (+1/-1) oneconf/networksync/infraclient_pristine.py (+6/-1) oneconf/networksync/ssohandler.py (+1/-1) |
To merge this branch: | bzr merge lp:~brunonova/oneconf/lp1165104 |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Iain Lane | Approve | ||
Didier Roche-Tolomelli | Pending | ||
Barry Warsaw | Pending | ||
Review via email: mp+198429@code.launchpad.net |
Description of the change
These commits try to fix bug LP: #1165104. I tested this in my laptop (and Virtualbox) and it seems to be working for me (in Saucy).
I tested this by running "oneconf-service --debug" right from the source code directory, without installing (and, if it was already running, I execute "oneconf-query --stop" first).
With the service running, I watch its debug output, start the Ubuntu Software Center (USC), make sure it's configured to synchronize (clicking the "File > Sync" option in the menu) and check to see if it displays the correct sync results (if it shows the other computers and if it can show a comparison of what is and is not installed in them).
If it's not working yet, I quit USC and restart the oneconf service, and try again (it may sync what's missing).
I did this in my laptop and in Virtualbox (with an Ubuntu Live DVD).
It is also useful to check the files in ~/.cache/
The two changes where "Ubuntu Software Center" was renamed to "Ubuntu One" are meant only for Saucy and newer releases.
The comments in the bug report have more info.
Thanks for this fix proposal!
Your fixes sounds legit and should work. However, I'm puzzle because running directly your branch or even building the package, I'm still getting: networksync: Invalid machine list from server, stopping sync: 401: {'date': 'Fri, 13 Dec 2013 09:14:16 GMT', 'etag': '"7e287fc885d9f dcf42da3a12f385 72c1"', 'content-type': 'text/html; charset=utf-8', 'last-modified': 'Fri, 13 Dec 2013 09:14:16 GMT', 'cache-control': 'max-age=0', 'server': 'Apache/2.2.22 (Ubuntu)', 'www-authenticate': 'OAuth realm="Ubuntu Software Center"', 'content-length': '22', 'status': '401', 'expires': 'Fri, 13 Dec 2013 09:14:16 GMT', 'vary': 'Authorization', 'strict- transport- security' : 'max-age=2592000'}
ERROR:oneconf.
I grepped into the oneconf repository and I don't see any trace of "Ubuntu Software Center" token. I won't have time to look at it today (holidays and a lot of touch stuff to catchup), but if you have any time to have a deeper look, that will be great!
I tried:
- latest trusty
- bzr branch <your branch>
- ./oneconf-service --debug
I tried as well: oneconf/ oneconf- service --debug
- bzr branch <your branch>
- bzr bd
- install the .debs (checking that the python3 binary files were updated)
- /usr/share/
Did you change any other file on your system for the cred testing?
Once I'm back from holidays, I'll give it another look. If you have time before me, it would be great to see that fixed ;)