git.cweiske.de
/
enigma2.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
create global (real) config entries, update setup on hotplug (untested), fix apply...
[enigma2.git]
/
lib
/
python
/
Plugins
/
SystemPlugins
/
SoftwareUpdate
/
plugin.py
diff --git
a/lib/python/Plugins/SystemPlugins/SoftwareUpdate/plugin.py
b/lib/python/Plugins/SystemPlugins/SoftwareUpdate/plugin.py
index c71ffdbb59ab77015de26c1aab0a6cc6afcb5b05..c283dd04957028cc5eabebe2922b0f1a48f01113 100644
(file)
--- a/
lib/python/Plugins/SystemPlugins/SoftwareUpdate/plugin.py
+++ b/
lib/python/Plugins/SystemPlugins/SoftwareUpdate/plugin.py
@@
-4,7
+4,6
@@
from Components.Input import Input
from Components.Ipkg import IpkgComponent
from Components.Label import Label
from Components.MenuList import MenuList
from Components.Ipkg import IpkgComponent
from Components.Label import Label
from Components.MenuList import MenuList
-from Components.ScrollLabel import ScrollLabel
from Components.Slider import Slider
from Plugins.Plugin import PluginDescriptor
from Screens.Console import Console
from Components.Slider import Slider
from Plugins.Plugin import PluginDescriptor
from Screens.Console import Console
@@
-291,6
+290,12
@@
class UpdatePlugin(Screen):
elif event == IpkgComponent.EVENT_CONFIGURING:
self.package.setText(param)
self.status.setText(_("Configuring"))
elif event == IpkgComponent.EVENT_CONFIGURING:
self.package.setText(param)
self.status.setText(_("Configuring"))
+ elif event == IpkgComponent.EVENT_MODIFIED:
+ self.session.openWithCallback(
+ self.modificationCallback,
+ MessageBox,
+ _("A configuration file (%s) was modified since Installation.\nDo you want to keep your version?") % (param)
+ )
elif event == IpkgComponent.EVENT_ERROR:
self.error += 1
elif event == IpkgComponent.EVENT_DONE:
elif event == IpkgComponent.EVENT_ERROR:
self.error += 1
elif event == IpkgComponent.EVENT_DONE:
@@
-316,7
+321,10
@@
class UpdatePlugin(Screen):
self.status.setText(_("Error") + " - " + error)
#print event, "-", param
pass
self.status.setText(_("Error") + " - " + error)
#print event, "-", param
pass
-
+
+ def modificationCallback(self, res):
+ self.ipkg.write(res and "N" or "Y")
+
def exit(self):
if not self.ipkg.isRunning():
if self.packages != 0 and self.error == 0:
def exit(self):
if not self.ipkg.isRunning():
if self.packages != 0 and self.error == 0: