* add "--devel-release" as option

3 files changed, 18 insertions, 3 deletions

diff --git a/UpdateManager/MetaRelease.py b/UpdateManager/MetaRelease.py
index fde705bb..0cfb9f36 100644
--- a/UpdateManager/MetaRelease.py
+++ b/UpdateManager/MetaRelease.py
@@ -44,7 +44,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-test2"
+    METARELEASE_URI_UNSTABLE = "http://changelogs.ubuntu.com/meta-release-development"
     METARELEASE_FILE = "/var/lib/update-manager/meta-release"
 
     __gsignals__ = { 
diff --git a/UpdateManager/UpdateManager.py b/UpdateManager/UpdateManager.py
index bad5af88..93f17a3d 100644
--- a/UpdateManager/UpdateManager.py
+++ b/UpdateManager/UpdateManager.py
@@ -738,8 +738,11 @@ class UpdateManager(SimpleGladeApp):
               self.on_button_reload_clicked(None)
 
 
-  def main(self):
+  def main(self, options):
     self.meta = MetaRelease()
+    # the user wants to see the development release
+    if options.devel_release:
+        self.meta.METARELEASE_URI = self.meta.METARELEASE_URI_UNSTABLE
     self.meta.connect("new_dist_available",self.new_dist_available)
     self.meta.connect("dist_no_longer_supported",self.dist_no_longer_supported)
     
diff --git a/update-manager b/update-manager
index 04005c74..6c1f3fd0 100644
--- a/update-manager
+++ b/update-manager
@@ -33,7 +33,10 @@ from UpdateManager.UpdateManager import UpdateManager
 import gettext
 from gettext import gettext as _
 
+from optparse import OptionParser
+
 if __name__ == "__main__":
+  _ = gettext.gettext
 
   APP="update-manager"
   DIR="/usr/share/locale"
@@ -43,6 +46,15 @@ if __name__ == "__main__":
   gtk.glade.bindtextdomain(APP, DIR)
   gtk.glade.textdomain(APP)
 
+  # Begin parsing of options
+  parser = OptionParser()
+  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")
+
+  (options, args) = parser.parse_args()
+
   if os.geteuid() != 0:
     dialog = gtk.MessageDialog(None, 0, gtk.MESSAGE_ERROR, gtk.BUTTONS_OK,
                                _("You need to be root to run this program"))
@@ -53,4 +65,4 @@ if __name__ == "__main__":
   data_dir="/usr/share/update-manager/"
   #data_dir="/tmp/xxx/share/update-manager/"
   app = UpdateManager(data_dir)
-  app.main()
+  app.main(options)