r11774 - in /packages/experimental/update-manager/debian: changelog patches/02_disable_dist_upgrade.diff

[kov at users.alioth.debian.org]

Author: kov
Date: Tue Jul  3 00:34:51 2007
New Revision: 11774

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=11774
Log:
disable the dist-upgrade functionality, since we do not
support it in Debian

Added:
    packages/experimental/update-manager/debian/patches/02_disable_dist_upgrade.diff
Modified:
    packages/experimental/update-manager/debian/changelog

Modified: packages/experimental/update-manager/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/experimental/update-manager/debian/changelog?rev=11774&op=diff
==============================================================================
--- packages/experimental/update-manager/debian/changelog (original)
+++ packages/experimental/update-manager/debian/changelog Tue Jul  3 00:34:51 2007
@@ -10,8 +10,11 @@
   * debian/dirs -> debian/update-manager-core.dirs:
   - rename to make it clear what package should contain the
     directories
-
- -- Gustavo Noronha Silva <kov at debian.org>  Mon, 02 Jul 2007 20:47:21 -0300
+  * debian/patches/02_disable_dist_upgrade.diff:
+  - disable all the 'dist-upgrade' handling for now; we do not
+    support the meta-release magic yet (if ever)
+
+ -- Gustavo Noronha Silva <kov at debian.org>  Mon, 02 Jul 2007 21:34:24 -0300
 
 update-manager (0.64-1) experimental; urgency=low
 

Added: packages/experimental/update-manager/debian/patches/02_disable_dist_upgrade.diff
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/experimental/update-manager/debian/patches/02_disable_dist_upgrade.diff?rev=11774&op=file
==============================================================================
--- packages/experimental/update-manager/debian/patches/02_disable_dist_upgrade.diff (added)
+++ packages/experimental/update-manager/debian/patches/02_disable_dist_upgrade.diff Tue Jul  3 00:34:51 2007
@@ -1,0 +1,61 @@
+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-02 21:18:03.000000000 -0300
+@@ -46,22 +46,31 @@
+ 
+   # Begin parsing of options
+   parser = OptionParser()
+-  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"))
++# 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"))
+ 
+   (options, args) = parser.parse_args()
+ 
++  # (Debian) let's add placeholder configuration information so that the
++  # patch doesn't get too intrusive
++  options.check_dist_upgrades = False
++  options.devel_release = False
++  options.use_proposed = False
++  options.dist_upgrade = False
++
+   data_dir="/usr/share/update-manager/"
+   #data_dir="/tmp/xxx/share/update-manager/"
+ 
+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-02 21:10:40.000000000 -0300
+@@ -885,7 +885,8 @@
+           self.store.append([contents, pkg.name, pkg])
+     self.update_count()
+     self.setBusy(False)
+-    self.check_all_updates_installable()
++    # on Debian we don't yet use meta-release
++    #self.check_all_updates_installable()
+     return False
+ 
+   def dist_no_longer_supported(self, meta_release):