Merge lp:~mvo/software-center/lp926763 into lp:software-center

[Ritesh Khadgaray]

Don't require network access for installing local .deb packages.

Cannot install deb files without network connection (lp: #926763)

[dobey (dobey)]

Please use bzr commit --fixes to link the branch, instead.

review: Needs Fixing

[lp:~mvo/software-center/lp926763]

3261. By Michael Vogt on 2013-09-30

added missing --fixes lp:926763

[Ritesh Khadgaray (khadgaray)]

review: Needs Resubmitting

[Ritesh Khadgaray (khadgaray)]

Please ignore the last comment.

[dobey (dobey)]

Ritesh, voting resubmit does not "resubmit" the branch. Please change your vote to abstain or approve.

[dobey (dobey)]

review: Approve

[Ritesh Khadgaray (khadgaray)]

review: Abstain

[Ritesh Khadgaray (khadgaray)]

fixed.

review: Approve

=== modified file 'softwarecenter/ui/gtk3/views/appdetailsview.py'
--- softwarecenter/ui/gtk3/views/appdetailsview.py	2012-12-17 09:53:32 +0000
+++ softwarecenter/ui/gtk3/views/appdetailsview.py	2013-09-30 11:44:19 +0000
@@ -35,7 +35,10 @@
 from softwarecenter.netstatus import (NetState, get_network_watcher,
                                       network_state_is_connected)
 from softwarecenter.db.application import Application
-from softwarecenter.db import DebFileApplication
+from softwarecenter.db.debfile import (
+    DebFileApplication,
+    AppDetailsDebFile,
+    )
 from softwarecenter.backend.reviews import ReviewStats
 from softwarecenter.enums import (AppActions,
                                   PkgStates,
@@ -452,7 +455,14 @@
                           AppActions.APPLY)):
             self.set_label(self.app_details.warning)
 
-        sensitive = network_state_is_connected()
+        connected = network_state_is_connected()
+        self.set_network_is_connected(connected)
+
+    def set_network_is_connected(self, have_network):
+        sensitive = have_network
+        # debs can always be installed(?)
+        if isinstance(self.app_details, AppDetailsDebFile):
+            sensitive = True
         self.button.set_sensitive(sensitive)
 
     def _convert_purchase_date_str_to_datetime(self, purchase_date):
@@ -911,7 +921,7 @@
 
         # set addon table and action button states based on sensitivity
         sensitive = state in NetState.NM_STATE_CONNECTED_LIST
-        self.pkg_statusbar.button.set_sensitive(sensitive)
+        self.pkg_statusbar.set_network_is_connected(sensitive)
         self.addon_view.addons_set_sensitive(sensitive)
         self.addons_statusbar.button_apply.set_sensitive(sensitive)
         self.addons_statusbar.button_cancel.set_sensitive(sensitive)