diff options
| -rw-r--r-- | DistUpgrade/DistUpgrade.glade | 5 | ||||
| -rw-r--r-- | DistUpgrade/DistUpgradeControler.py | 3 | ||||
| -rw-r--r-- | DistUpgrade/DistUpgradeViewGtk.py | 10 | ||||
| -rw-r--r-- | UpdateManager/MetaRelease.py | 9 | ||||
| -rw-r--r-- | UpdateManager/UpdateManager.py | 2 | ||||
| -rw-r--r-- | debian/changelog | 7 |
6 files changed, 27 insertions, 9 deletions
diff --git a/DistUpgrade/DistUpgrade.glade b/DistUpgrade/DistUpgrade.glade index d04f8623..7ad420da 100644 --- a/DistUpgrade/DistUpgrade.glade +++ b/DistUpgrade/DistUpgrade.glade @@ -19,6 +19,8 @@ <property name="gravity">GDK_GRAVITY_NORTH_WEST</property> <property name="focus_on_map">True</property> <property name="urgency_hint">False</property> + <signal name="delete_event" handler="on_window_main_delete_event" last_modification_time="Mon, 23 Jan 2006 15:30:09 GMT"/> + <signal name="destroy_event" handler="on_window_main_destroy_event" last_modification_time="Mon, 23 Jan 2006 15:30:19 GMT"/> <child> <widget class="GtkVBox" id="vbox5"> @@ -382,7 +384,7 @@ <child> <widget class="GtkExpander" id="expander_terminal"> <property name="can_focus">True</property> - <property name="expanded">True</property> + <property name="expanded">False</property> <property name="spacing">0</property> <child> @@ -462,7 +464,6 @@ <child> <widget class="GtkHButtonBox" id="hbuttonbox2"> <property name="border_width">6</property> - <property name="visible">True</property> <property name="layout_style">GTK_BUTTONBOX_END</property> <property name="spacing">6</property> diff --git a/DistUpgrade/DistUpgradeControler.py b/DistUpgrade/DistUpgradeControler.py index e67009cf..bea1e40f 100644 --- a/DistUpgrade/DistUpgradeControler.py +++ b/DistUpgrade/DistUpgradeControler.py @@ -217,9 +217,8 @@ class DistUpgradeControler(object): self._view.error(_("Error during commit"), _("Some problem occured during the clean-up. " "Please see the below message for more " - "information. ", + "information. "), "%s" % e) - self.cache.commit(fprogress,iprogress) def askForReboot(self): diff --git a/DistUpgrade/DistUpgradeViewGtk.py b/DistUpgrade/DistUpgradeViewGtk.py index b6ff38b2..a313ce4f 100644 --- a/DistUpgrade/DistUpgradeViewGtk.py +++ b/DistUpgrade/DistUpgradeViewGtk.py @@ -27,6 +27,7 @@ import gtk.glade import vte import gobject import pango +import sys import apt import apt_pkg @@ -296,6 +297,15 @@ class GtkDistUpgradeView(DistUpgradeView,SimpleGladeApp): return True return False + def on_window_main_delete_event(self, widget, event): + #print "on_window_main_delete_event()" + summary = _("Are you sure you want cancel?") + msg = _("Canceling during a upgrade can leave the system in a " + "unstable state. It is strongly adviced to continue " + "the operation. ") + if self.askYesNoQuestion(summary, msg): + self.exit(1) + return True if __name__ == "__main__": view = GtkDistUpgradeView() diff --git a/UpdateManager/MetaRelease.py b/UpdateManager/MetaRelease.py index d99e9ae9..451c48f0 100644 --- a/UpdateManager/MetaRelease.py +++ b/UpdateManager/MetaRelease.py @@ -43,7 +43,7 @@ class MetaRelease(gobject.GObject): # some constants METARELEASE_URI = "http://changelogs.ubuntu.com/meta-release" - #METARELEASE_URI = "http://people.ubuntu.com/~mvo/dist-upgrader/meta-release-test" + #METARELEASE_URI = "http://people.ubuntu.com/~mvo/dist-upgrader/meta-release-test.save" METARELEASE_FILE = "/var/lib/update-manager/meta-release" __gsignals__ = { @@ -97,6 +97,7 @@ class MetaRelease(gobject.GObject): while step_result: if index_tag.Section.has_key("Dist"): name = index_tag.Section["Dist"] + #print name rawdate = index_tag.Section["Date"] date = time.mktime(rfc822.parsedate(rawdate)) supported = index_tag.Section["Supported"] @@ -118,10 +119,10 @@ class MetaRelease(gobject.GObject): print "current dist not found in meta-release file" return False - # then see what we can upgrade to + # then see what we can upgrade to (only upgrade to supported dists) upgradable_to = "" for dist in dists: - if dist.date > current_dist.date: + if dist.date > current_dist.date and dist.supported == True: upgradable_to = dist #print "new dist: %s" % upgradable_to break @@ -129,7 +130,7 @@ class MetaRelease(gobject.GObject): # only warn if unsupported and a new dist is available (because # the development version is also unsupported) if upgradable_to != "" and not current_dist.supported: - self.emit("dist_no_longer_supported",upgradable_to) + self.emit("dist_no_longer_supported",upgradabl_to) elif upgradable_to != "": self.emit("new_dist_available",upgradable_to) diff --git a/UpdateManager/UpdateManager.py b/UpdateManager/UpdateManager.py index d7ea050a..66e5f077 100644 --- a/UpdateManager/UpdateManager.py +++ b/UpdateManager/UpdateManager.py @@ -398,7 +398,7 @@ class UpdateManager(SimpleGladeApp): text_download = _("Download size: %s" % apt_pkg.SizeToStr(self.dl_size)) self.expander_details.set_sensitive(True) - self.treeview_update.set_sensitive(False) + self.treeview_update.set_sensitive(True) self.label_downsize.show() self.button_install.grab_default() self.label_header.set_markup(text_header) diff --git a/debian/changelog b/debian/changelog index ba733a42..38c3b232 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +update-manager (0.42.2ubuntu1) dapper; urgency=low + + * UpdateManager/MetaRelease.py: + - never offer a upgrade to a unsupported (i.e. developer) dist + + -- + update-manager (0.42.1ubuntu1) dapper; urgency=low * UpdateManagert: |