Merge lp:~glatzor/software-center/remove-workaround-747172 into lp:software-center

Proposed by Sebastian Heinlein on 2012-04-09
Status: Merged
Merged at revision: 3004
Proposed branch: lp:~glatzor/software-center/remove-workaround-747172
Merge into: lp:software-center
Diff against target: 22 lines (+0/-12)
1 file modified
softwarecenter/backend/installbackend_impl/aptd.py (+0/-12)
To merge this branch: bzr merge lp:~glatzor/software-center/remove-workaround-747172
Reviewer Review Type Date Requested Status
software-store-developers 2012-04-09 Pending
Review via email: mp+101222@code.launchpad.net

Description of the change

Please merge after the Precise release, since the error should now be fixed in aptdaemon.

To post a comment you must log in.
Gary Lasker (gary-lasker) wrote :

Hello Sebastian, and thanks for this! I am not sure if this should be merged yet, based on your comment in the proposal description ("Please merge after the Precise release"). This can be merged as soon as the corresponding aptdaemon fix has been released to Precise, correct? Is there a reason we need to wait for after release of Precise itself?

Please let us know if this one and lp:~glatzor/software-center/fix-977020 are ready to be reviewed and merged now. I'll wait to hear back from you, just to be sure.

And thanks again!

Sebastian Heinlein (glatzor) wrote :

Am Montag, den 09.04.2012, 17:08 +0000 schrieb Gary Lasker:
> Hello Sebastian, and thanks for this! I am not sure if this should be merged yet, based on your comment in the proposal description ("Please merge after the Precise release"). This can be merged as soon as the corresponding aptdaemon fix has been released to Precise, correct? Is there a reason we need to wait for after release of Precise itself?
>
> Please let us know if this one and lp:~glatzor/software-center/fix-977020 are ready to be reviewed and merged now. I'll wait to hear back from you, just to be sure.
>
> And thanks again!

Hello Garry,

All patches are ready to be merged. But remove-workaround-747172 should
land after the fix in aptdaemon has been released. I added the comment
since it is basically only a code clean up change but there could also
be another reason for this bug.

Thanks for reviewing.

Cheers,

Sebastian

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'softwarecenter/backend/installbackend_impl/aptd.py'
2--- softwarecenter/backend/installbackend_impl/aptd.py 2012-03-16 20:12:57 +0000
3+++ softwarecenter/backend/installbackend_impl/aptd.py 2012-04-09 06:55:27 +0000
4@@ -783,18 +783,6 @@
5 utf8(enums.get_error_description_from_enum(trans.error_code)),
6 utf8(cleaned_error_details))
7 self._logger.error("error in _on_trans_finished '%s'" % msg)
8- # show dialog to the user and exit (no need to reopen the cache)
9- if not trans.error_code:
10- # sometimes aptdaemon doesn't return a value for error_code
11- # when the network connection has become unavailable; in
12- # that case, we will assume it's a failure during a package
13- # download because that is the only case where we see this
14- # happening - this avoids display of an empty error dialog
15- # and correctly prompts the user to check their network
16- # connection (see LP: #747172)
17- # FIXME: fix aptdaemon to return a valid error_code under
18- # all conditions
19- trans.error_code = enums.ERROR_PACKAGE_DOWNLOAD_FAILED
20 # show dialog to the user and exit (no need to reopen
21 # the cache)
22 res = self.ui.error(None,