r12301 - /packages/experimental/update-manager/debian/patches/02_replace_dist_upgrade.diff
kov at users.alioth.debian.org
kov at users.alioth.debian.org
Fri Aug 10 01:04:09 UTC 2007
Author: kov
Date: Fri Aug 10 01:04:08 2007
New Revision: 12301
URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=12301
Log:
updated patch to update-manager 0.68
Modified:
packages/experimental/update-manager/debian/patches/02_replace_dist_upgrade.diff
Modified: packages/experimental/update-manager/debian/patches/02_replace_dist_upgrade.diff
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/experimental/update-manager/debian/patches/02_replace_dist_upgrade.diff?rev=12301&op=diff
==============================================================================
--- packages/experimental/update-manager/debian/patches/02_replace_dist_upgrade.diff (original)
+++ packages/experimental/update-manager/debian/patches/02_replace_dist_upgrade.diff Fri Aug 10 01:04:08 2007
@@ -1,6 +1,6 @@
-diff -urN update-manager-0.64.old/data/glade/UpdateManager.glade~ update-manager-0.64/data/glade/UpdateManager.glade
---- update-manager-0.64.old/data/glade/UpdateManager.glade~ 2007-03-26 06:18:34.000000000 -0300
-+++ update-manager-0.64/data/glade/UpdateManager.glade 2007-07-15 16:01:41.000000000 -0300
+diff -urN update-manager-0.68.debian.orig/data/glade/UpdateManager.glade update-manager-0.68.debian/data/glade/UpdateManager.glade
+--- update-manager-0.68.debian.orig/data/glade/UpdateManager.glade 2007-03-26 06:18:34.000000000 -0300
++++ update-manager-0.68.debian/data/glade/UpdateManager.glade 2007-08-09 22:01:39.000000000 -0300
@@ -1403,7 +1403,7 @@
<property name="visible">True</property>
<property name="can_default">True</property>
@@ -35,10 +35,10 @@
<property name="use_underline">False</property>
<property name="use_markup">False</property>
<property name="justify">GTK_JUSTIFY_LEFT</property>
-diff -urN update-manager-0.64.old/update-manager update-manager-0.64/update-manager
---- update-manager-0.64.old/update-manager 2007-06-18 10:23:15.000000000 -0300
-+++ update-manager-0.64/update-manager 2007-07-15 15:54:59.000000000 -0300
-@@ -46,46 +46,32 @@
+diff -urN update-manager-0.68.debian.orig/update-manager update-manager-0.68.debian/update-manager
+--- update-manager-0.68.debian.orig/update-manager 2007-06-25 07:19:44.000000000 -0300
++++ update-manager-0.68.debian/update-manager 2007-08-09 22:01:39.000000000 -0300
+@@ -46,51 +46,32 @@
# Begin parsing of options
parser = OptionParser()
@@ -52,18 +52,18 @@
- parser.add_option ("-p","--proposed", action="store_true",
- dest="use_proposed", default=False,
- help=_("Try to run a dist-upgrade"))
-+# on Debian we still don't support meta-release, so comment all options that
-+# use it (all, as of now!)
-+# parser.add_option ("-c", "--check-dist-upgrades", action="store_true",
-+# dest="check_dist_upgrades", default=False,
-+# help=_("Check if a new distribution release is available"))
-+# parser.add_option ("-d", "--devel-release", action="store_true",
-+# dest="devel_release", default=False,
-+# help=_("Check if upgrading to the latest devel release "
-+# "is possible"))
-+# parser.add_option ("-p","--proposed", action="store_true",
-+# dest="use_proposed", default=False,
-+# help=_("Try to run a dist-upgrade"))
++ # on Debian we still don't support meta-release, so comment all options that
++ # use it (all, as of now!)
++ # parser.add_option ("-c", "--check-dist-upgrades", action="store_true",
++ # dest="check_dist_upgrades", default=False,
++ # help=_("Check if a new distribution release is available"))
++ # parser.add_option ("-d", "--devel-release", action="store_true",
++ # dest="devel_release", default=False,
++ # help=_("Check if upgrading to the latest devel release "
++ # "is possible"))
++ # parser.add_option ("-p","--proposed", action="store_true",
++ # dest="use_proposed", default=False,
++ # help=_("Try to run a dist-upgrade"))
parser.add_option ("--dist-upgrade","--dist-ugprade", action="store_true",
dest="dist_upgrade", default=False,
help=_("Try to run a dist-upgrade"))
@@ -93,7 +93,12 @@
- controler.prepare()
- controler.doPreUpgrade()
- if controler.askDistUpgrade():
-- view.setStep(STEP_FETCH_INSTALL)
+- view.setStep(STEP_FETCH)
+- view.updateStatus(_("Fetching"))
+- if not controler.doDistUpgradeFetching():
+- sys.exit(1)
+- view.setStep(STEP_INSTALL)
+- view.updateStatus(_("Upgrading"))
- if not controler.doDistUpgrade():
- sys.exit(1)
- view.setStep(STEP_CLEANUP)
@@ -105,10 +110,10 @@
- app.main(options)
+ app = UpdateManager(data_dir)
+ app.main(options)
-diff -urN update-manager-0.64.old/UpdateManager/UpdateManager.py update-manager-0.64/UpdateManager/UpdateManager.py
---- update-manager-0.64.old/UpdateManager/UpdateManager.py 2007-06-13 07:51:17.000000000 -0300
-+++ update-manager-0.64/UpdateManager/UpdateManager.py 2007-07-15 15:57:08.000000000 -0300
-@@ -113,14 +113,11 @@
+diff -urN update-manager-0.68.debian.orig/UpdateManager/UpdateManager.py update-manager-0.68.debian/UpdateManager/UpdateManager.py
+--- update-manager-0.68.debian.orig/UpdateManager/UpdateManager.py 2007-08-09 21:59:34.000000000 -0300
++++ update-manager-0.68.debian/UpdateManager/UpdateManager.py 2007-08-09 22:01:39.000000000 -0300
+@@ -116,14 +116,11 @@
@property
def installCount(self):
return self._depcache.InstCount
@@ -124,9 +129,9 @@
- self._depcache.Upgrade()
+ assert self._depcache.BrokenCount == 0
return wouldDelete
-
- def get_changelog(self, name, lock):
-@@ -231,8 +228,9 @@
+ def matchPackageOrigin(self, pkg, matcher):
+ """ match 'pkg' origin against 'matcher', take versions between
+@@ -260,8 +257,9 @@
self.importance = importance
self.description = desc
@@ -137,7 +142,7 @@
pipe = os.popen("lsb_release -c -s")
dist = pipe.read().strip()
del pipe
-@@ -256,7 +254,7 @@
+@@ -289,7 +287,7 @@
self.held_back = []
# do the upgrade
@@ -146,7 +151,7 @@
# sort by origin
for pkg in cache:
-@@ -588,7 +586,7 @@
+@@ -614,7 +612,7 @@
Select all updates
"""
self.setBusy(True)
@@ -155,7 +160,7 @@
self.treeview_update.queue_draw()
self.refresh_updates_count()
self.setBusy(False)
-@@ -841,7 +839,7 @@
+@@ -867,7 +865,7 @@
dialog.destroy()
sys.exit(1)
self.store.clear()
@@ -164,7 +169,7 @@
# fill them again
try:
self.list.update(self.cache)
-@@ -989,7 +987,7 @@
+@@ -1015,7 +1013,7 @@
def check_all_updates_installable(self):
""" Check if all available updates can be installed and suggest
to run a distribution upgrade if not """
More information about the pkg-gnome-commits
mailing list