client/rhel/rhn-client-tools/rhn-client-tools.spec | 5
client/rhel/rhn-client-tools/src/firstboot-legacy-rhel5/Makefile | 2
client/rhel/rhn-client-tools/src/firstboot-legacy-rhel5/rhn_choose_channel.py | 71
++++++++++
rel-eng/packages/rhn-client-tools | 2
4 files changed, 77 insertions(+), 3 deletions(-)
New commits:
commit 3e7cdec6f7db5209f4cb3206ecd16c55eaa1d022
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Mon Jan 31 13:03:39 2011 +0100
Automatic commit of package [rhn-client-tools] release [1.3.12-1].
diff --git a/client/rhel/rhn-client-tools/rhn-client-tools.spec
b/client/rhel/rhn-client-tools/rhn-client-tools.spec
index 66e59a7..1a8bb10 100644
--- a/client/rhel/rhn-client-tools/rhn-client-tools.spec
+++ b/client/rhel/rhn-client-tools/rhn-client-tools.spec
@@ -4,7 +4,7 @@ Group: System Environment/Base
Source0:
https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
URL:
https://fedorahosted.org/spacewalk
Name: rhn-client-tools
-Version: 1.3.11
+Version: 1.3.12
Release: 1%{?dist}
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch: noarch
@@ -292,6 +292,9 @@ make -f Makefile.rhn-client-tools test
%endif
%changelog
+* Mon Jan 31 2011 Miroslav Suchý <msuchy(a)redhat.com> 1.3.12-1
+- cp firstboot/rhn_choose_channel.py firstboot-legacy-rhel5/
+
* Fri Jan 28 2011 Miroslav Suchý <msuchy(a)redhat.com> 1.3.11-1
- break circular import
- 580479 - put new submodule into package
diff --git a/rel-eng/packages/rhn-client-tools b/rel-eng/packages/rhn-client-tools
index 97685ce..81aee16 100644
--- a/rel-eng/packages/rhn-client-tools
+++ b/rel-eng/packages/rhn-client-tools
@@ -1 +1 @@
-1.3.11-1 client/rhel/rhn-client-tools/
+1.3.12-1 client/rhel/rhn-client-tools/
commit 7f07895855663fbf5a9a35fbf1eabcede5fb0970
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Mon Jan 31 13:02:56 2011 +0100
cp firstboot/rhn_choose_channel.py firstboot-legacy-rhel5/
diff --git a/client/rhel/rhn-client-tools/src/firstboot-legacy-rhel5/Makefile
b/client/rhel/rhn-client-tools/src/firstboot-legacy-rhel5/Makefile
index bbd6365..1de5aca 100644
--- a/client/rhel/rhn-client-tools/src/firstboot-legacy-rhel5/Makefile
+++ b/client/rhel/rhn-client-tools/src/firstboot-legacy-rhel5/Makefile
@@ -6,7 +6,7 @@ MODULES = rhn_login_gui \
rhn_register_firstboot_gui_window \
rhn_start_gui rhn_choose_server_gui \
rhn_provide_certificate_gui rhn_create_profile_gui \
- rhn_review_gui rhn_finish_gui
+ rhn_review_gui rhn_finish_gui rhn_choose_channel
PYFILES = $(addsuffix .py, $(MODULES))
OBJECTS = $(PYFILES) $(addsuffix .pyc, $(MODULES))
diff --git a/client/rhel/rhn-client-tools/src/firstboot-legacy-rhel5/rhn_choose_channel.py
b/client/rhel/rhn-client-tools/src/firstboot-legacy-rhel5/rhn_choose_channel.py
new file mode 100644
index 0000000..f82921b
--- /dev/null
+++ b/client/rhel/rhn-client-tools/src/firstboot-legacy-rhel5/rhn_choose_channel.py
@@ -0,0 +1,71 @@
+# Copyright 2011 Red Hat, Inc.
+# Copyright 2003 Brent Fox <bfox(a)redhat.com>
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+#
+# Authors:
+# Miroslav Suchy <msuchy(a)redhat.com>
+
+import sys
+sys.path.append("/usr/share/rhn")
+from up2date_client import rhnreg, rhnregGui, rhnserver
+
+import gtk
+
+import gettext
+_ = lambda x: gettext.ldgettext("rhn-client-tools", x)
+
+gtk.glade.bindtextdomain("rhn-client-tools")
+
+from firstboot.module import Module
+from firstboot.constants import RESULT_SUCCESS, RESULT_FAILURE, RESULT_JUMP
+
+class moduleClass(Module):
+ def __init__(self):
+ Module.__init__(self)
+ self.priority = 108.6
+ self.sidebarTitle = _("Select operating system release")
+ self.title = _("Select operating system release")
+ self.chooseChannel = FirstbootChooseChannelPage()
+
+ def needsNetwork(self):
+ return True
+
+ def apply(self, interface, testing=False):
+ if testing:
+ return RESULT_SUCCESS
+
+ self.chooseChannel.chooseChannelPageApply()
+ return RESULT_SUCCESS
+
+ def createScreen(self):
+ self.vbox = gtk.VBox(spacing=5)
+ self.vbox.pack_start(self.chooseChannel.chooseChannelPageVbox(), True, True)
+
+ def initializeUI(self):
+ # populate capability - needef for EUSsupported
+ s = rhnserver.RhnServer()
+ s.capabilities.validate()
+
+ # this populate zstream channels as side effect
+ self.chooseChannel.chooseChannelShouldBeShown()
+
+ self.chooseChannel.chooseChannelPagePrepare()
+
+ def shouldAppear(self):
+ return not rhnreg.registered()
+
+class FirstbootChooseChannelPage(rhnregGui.ChooseChannelPage):
+ pass