client/rhel
by StephenHerr
client/rhel/rhn-client-tools/data/rh_register.glade | 743 ++--------
client/rhel/rhn-client-tools/etc-conf/up2date.config | 3
client/rhel/rhn-client-tools/src/Makefile | 2
client/rhel/rhn-client-tools/src/firstboot-legacy-rhel6/Makefile | 45
client/rhel/rhn-client-tools/src/firstboot-legacy-rhel6/rhn_choose_channel.py | 70
client/rhel/rhn-client-tools/src/firstboot-legacy-rhel6/rhn_choose_server_gui.py | 94 +
client/rhel/rhn-client-tools/src/firstboot-legacy-rhel6/rhn_create_profile_gui.py | 93 +
client/rhel/rhn-client-tools/src/firstboot-legacy-rhel6/rhn_finish_gui.py | 68
client/rhel/rhn-client-tools/src/firstboot-legacy-rhel6/rhn_login_gui.py | 118 +
client/rhel/rhn-client-tools/src/firstboot-legacy-rhel6/rhn_provide_certificate_gui.py | 74
client/rhel/rhn-client-tools/src/firstboot-legacy-rhel6/rhn_register.py | 31
client/rhel/rhn-client-tools/src/firstboot-legacy-rhel6/rhn_review_gui.py | 67
client/rhel/rhn-client-tools/src/firstboot-legacy-rhel6/rhn_start_gui.py | 138 +
client/rhel/rhn-client-tools/src/firstboot/Makefile | 45
client/rhel/rhn-client-tools/src/firstboot/rhn_choose_channel.py | 70
client/rhel/rhn-client-tools/src/firstboot/rhn_choose_server_gui.py | 95 -
client/rhel/rhn-client-tools/src/firstboot/rhn_create_profile_gui.py | 93 -
client/rhel/rhn-client-tools/src/firstboot/rhn_finish_gui.py | 68
client/rhel/rhn-client-tools/src/firstboot/rhn_login_gui.py | 118 -
client/rhel/rhn-client-tools/src/firstboot/rhn_provide_certificate_gui.py | 74
client/rhel/rhn-client-tools/src/firstboot/rhn_register.py | 31
client/rhel/rhn-client-tools/src/firstboot/rhn_review_gui.py | 67
client/rhel/rhn-client-tools/src/firstboot/rhn_start_gui.py | 138 -
client/rhel/rhn-client-tools/src/up2date_client/config.py | 24
client/rhel/rhn-client-tools/src/up2date_client/rhnreg.py | 138 -
client/rhel/rhn-client-tools/src/up2date_client/rhnregGui.py | 460 ++----
client/rhel/rhn-client-tools/src/up2date_client/rhnreg_constants.py | 65
client/rhel/rhn-client-tools/src/up2date_client/tui.py | 178 +-
28 files changed, 1368 insertions(+), 1842 deletions(-)
New commits:
commit d733eead149d2089cfdea1ecbcbab6d78948324c
Author: Stephen Herr <sherr(a)redhat.com>
Date: Wed Oct 24 16:49:25 2012 -0400
869814 - removing firstboot and RHN Hosted integration from rhn-client-tools
diff --git a/client/rhel/rhn-client-tools/data/rh_register.glade b/client/rhel/rhn-client-tools/data/rh_register.glade
index 2d6d48a..a766f24 100644
--- a/client/rhel/rhn-client-tools/data/rh_register.glade
+++ b/client/rhel/rhn-client-tools/data/rh_register.glade
@@ -176,7 +176,7 @@ You may access the software update tool by running <b>Software Update</
<child>
<widget class="GtkLabel" id="chooseServerLabel">
<property name="visible">True</property>
- <property name="label" translatable="yes" context="yes">I'd like to register with:</property>
+ <property name="label" translatable="yes">I'd like to register with an RHN Satellite or RHN Proxy</property>
<property name="use_underline">False</property>
<property name="use_markup">True</property>
<property name="justify">GTK_JUSTIFY_LEFT</property>
@@ -190,9 +190,9 @@ You may access the software update tool by running <b>Software Update</
<property name="width_chars">-1</property>
<property name="single_line_mode">False</property>
<property name="angle">0</property>
- <accessibility>
- <atkproperty name="AtkObject::accessible_name" translatable="yes">I'd like to register with:</atkproperty>
- </accessibility>
+ <accessibility>
+ <atkproperty name="AtkObject::accessible_name" translatable="yes">I'd like to register with an RHN Satellite or RHN Proxy</atkproperty>
+ </accessibility>
</widget>
<packing>
<property name="padding">0</property>
@@ -226,134 +226,6 @@ You may access the software update tool by running <b>Software Update</
<property name="homogeneous">False</property>
<property name="spacing">15</property>
- <child>
- <widget class="GtkRadioButton" id="rhsmButton">
- <property name="tooltip" translatable="yes">Red Hat Subscription Management offers improved management and tracking of subscriptions and access to content. It is the recommended and default registration option.</property>
- <property name="visible">False</property>
- <property name="no_show_all">True</property>
- <property name="relief">GTK_RELIEF_NORMAL</property>
- <property name="focus_on_click">True</property>
- <property name="active">False</property>
- <property name="inconsistent">False</property>
- <property name="draw_indicator">True</property>
- <property name="group">hostedButton</property>
- <signal name="activate" handler="onRhsmButtonActivate"/>
-
- <child>
- <widget class="GtkLabel" id="label143">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="label" translatable="yes" context="yes">Red Hat Subscription Management</property>
- <property name="use_underline">True</property>
- <property name="use_markup">True</property>
- <property name="justify">GTK_JUSTIFY_LEFT</property>
- <property name="wrap">True</property>
- <property name="selectable">False</property>
- <property name="xalign">0.5</property>
- <property name="yalign">0.5</property>
- <property name="xpad">0</property>
- <property name="ypad">0</property>
- <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
- <property name="width_chars">-1</property>
- <property name="single_line_mode">False</property>
- <property name="angle">0</property>
- <accessibility>
- <atkproperty name="AtkObject::accessible_name" translatable="yes">Red Hat Subscription Management</atkproperty>
- </accessibility>
- </widget>
- </child>
- </widget>
- <packing>
- <property name="padding">0</property>
- <property name="expand">False</property>
- <property name="fill">False</property>
- </packing>
- </child>
-
- <child>
- <widget class="GtkRadioButton" id="hostedButton">
- <property name="tooltip" translatable="yes">RHN Classic provides system-level support and management of Red Hat systems and networks. Red Hat Subscription Management is the recommended service to use, but RHN Classic is still available.</property>
- <property name="visible">True</property>
- <property name="relief">GTK_RELIEF_NORMAL</property>
- <property name="focus_on_click">True</property>
- <property name="active">False</property>
- <property name="inconsistent">False</property>
- <property name="draw_indicator">True</property>
- <signal name="activate" handler="onHostedButtonActivate"/>
-
- <child>
- <widget class="GtkLabel" id="label96">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="label" translatable="yes" context="yes">Red Hat Network (RHN) Classic</property>
- <property name="use_underline">True</property>
- <property name="use_markup">True</property>
- <property name="justify">GTK_JUSTIFY_LEFT</property>
- <property name="wrap">True</property>
- <property name="selectable">False</property>
- <property name="xalign">0.5</property>
- <property name="yalign">0.5</property>
- <property name="xpad">0</property>
- <property name="ypad">0</property>
- <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
- <property name="width_chars">-1</property>
- <property name="single_line_mode">False</property>
- <property name="angle">0</property>
- <accessibility>
- <atkproperty name="AtkObject::accessible_name" translatable="yes">Red Hat Network (RHN) Classic</atkproperty>
- </accessibility>
- </widget>
- </child>
- </widget>
- <packing>
- <property name="padding">0</property>
- <property name="expand">False</property>
- <property name="fill">False</property>
- </packing>
- </child>
-
- <child>
- <widget class="GtkRadioButton" id="satelliteButton">
- <property name="visible">True</property>
- <property name="tooltip" translatable="yes">Satellite users have the benefits of RHN Classic without having to provide Internet access to connected systems. Proxy users enjoy reduced bandwidth requirements for RHN Classic and can deploy custom packages.</property>
- <property name="relief">GTK_RELIEF_NORMAL</property>
- <property name="focus_on_click">True</property>
- <property name="active">False</property>
- <property name="inconsistent">False</property>
- <property name="draw_indicator">True</property>
- <property name="group">hostedButton</property>
- <signal name="toggled" handler="onSatelliteButtonToggled"/>
-
- <child>
- <widget class="GtkLabel" id="label97">
- <property name="visible">True</property>
- <property name="label" translatable="yes" context="yes">An RHN Satellite or RHN Proxy</property>
- <property name="use_underline">True</property>
- <property name="use_markup">True</property>
- <property name="justify">GTK_JUSTIFY_LEFT</property>
- <property name="wrap">True</property>
- <property name="selectable">False</property>
- <property name="xalign">0.5</property>
- <property name="yalign">0.5</property>
- <property name="xpad">0</property>
- <property name="ypad">0</property>
- <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
- <property name="width_chars">-1</property>
- <property name="single_line_mode">False</property>
- <property name="angle">0</property>
- <accessibility>
- <atkproperty name="AtkObject::accessible_name" translatable="yes">An RHN Satellite or RHN Proxy</atkproperty>
- </accessibility>
- </widget>
- </child>
- </widget>
- <packing>
- <property name="padding">0</property>
- <property name="expand">False</property>
- <property name="fill">False</property>
- </packing>
- </child>
-
<child>
<widget class="GtkAlignment" id="alignment2">
<property name="visible">True</property>
@@ -375,7 +247,7 @@ You may access the software update tool by running <b>Software Update</
<child>
<widget class="GtkLabel" id="label93">
<property name="visible">True</property>
- <property name="label" translatable="yes" context="yes">Location:</property>
+ <property name="label" translatable="yes">Location:</property>
<property name="use_underline">False</property>
<property name="use_markup">False</property>
<property name="justify">GTK_JUSTIFY_LEFT</property>
@@ -389,14 +261,14 @@ You may access the software update tool by running <b>Software Update</
<property name="width_chars">-1</property>
<property name="single_line_mode">False</property>
<property name="angle">0</property>
- <accessibility>
- <atkproperty name="AtkObject::accessible_name" translatable="yes">Location:</atkproperty>
- </accessibility>
+ <accessibility>
+ <atkproperty name="AtkObject::accessible_name" translatable="yes">Location:</atkproperty>
+ </accessibility>
</widget>
<packing>
- <property name="padding">0</property>
- <property name="expand">False</property>
- <property name="fill">False</property>
+ <property name="padding">0</property>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
</packing>
</child>
@@ -404,7 +276,7 @@ You may access the software update tool by running <b>Software Update</
<widget class="GtkEntry" id="satelliteServerEntry">
<property name="visible">True</property>
<property name="tooltip" translatable="yes">Example: https://satellite.example.com/XMLRPC</property>
- <property name="can_focus">True</property>
+ <property name="can_focus">True</property>
<property name="editable">True</property>
<property name="visibility">True</property>
<property name="max_length">0</property>
@@ -417,9 +289,9 @@ You may access the software update tool by running <b>Software Update</
</accessibility>
</widget>
<packing>
- <property name="padding">5</property>
- <property name="expand">True</property>
- <property name="fill">True</property>
+ <property name="padding">5</property>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
</packing>
</child>
</widget>
@@ -450,7 +322,7 @@ You may access the software update tool by running <b>Software Update</
<child>
<widget class="GtkButton" id="advancedNetworkConfigurationButton">
<property name="visible">True</property>
- <property name="label" translatable="yes" context="yes">_Proxy Setup</property>
+ <property name="label" translatable="yes">_Proxy Setup</property>
<property name="use_underline">True</property>
<property name="relief">GTK_RELIEF_NORMAL</property>
<property name="focus_on_click">True</property>
@@ -510,7 +382,7 @@ You may access the software update tool by running <b>Software Update</
<child>
<widget class="GtkLabel" id="instructionsLabel">
<property name="visible">True</property>
- <property name="label" translatable="yes" context="yes">Please enter your Red Hat account information:</property>
+ <property name="label" translatable="yes">Please enter your Red Hat account information:</property>
<property name="use_underline">False</property>
<property name="use_markup">True</property>
<property name="justify">GTK_JUSTIFY_LEFT</property>
@@ -524,9 +396,9 @@ You may access the software update tool by running <b>Software Update</
<property name="width_chars">-1</property>
<property name="single_line_mode">False</property>
<property name="angle">0</property>
- <accessibility>
- <atkproperty name="AtkObject::accessible_name" translatable="yes">Please enter your Red Hat account information:</atkproperty>
- </accessibility>
+ <accessibility>
+ <atkproperty name="AtkObject::accessible_name" translatable="yes">Please enter your Red Hat account information:</atkproperty>
+ </accessibility>
</widget>
<packing>
<property name="padding">0</property>
@@ -550,78 +422,13 @@ You may access the software update tool by running <b>Software Update</
<child>
<widget class="GtkTable" id="table2">
<property name="visible">True</property>
- <property name="n_rows">3</property>
+ <property name="n_rows">2</property>
<property name="n_columns">2</property>
<property name="homogeneous">False</property>
<property name="row_spacing">15</property>
<property name="column_spacing">15</property>
<child>
- <widget class="GtkHBox" id="forgotInfoHbox">
- <property name="visible">True</property>
- <property name="homogeneous">False</property>
- <property name="spacing">0</property>
-
- <child>
- <widget class="GtkImage" id="tipIconHosted">
- <property name="visible">True</property>
- <property name="stock">gtk-info</property>
- <property name="icon_size">4</property>
- <property name="xalign">0.5</property>
- <property name="yalign">0</property>
- <property name="xpad">0</property>
- <property name="ypad">0</property>
- <property name="no_show_all">True</property>
- </widget>
- <packing>
- <property name="padding">0</property>
- <property name="expand">False</property>
- <property name="fill">False</property>
- </packing>
- </child>
-
- <child>
- <widget class="GtkLabel" id="forgotInfoHosted">
- <property name="visible">True</property>
- <property name="label" translatable="yes"><small>Tip: Forgot your login or password? Look it up at http://red.ht/lost_password</small></property>
- <property name="use_underline">False</property>
- <property name="use_markup">True</property>
- <property name="justify">GTK_JUSTIFY_LEFT</property>
- <property name="wrap">True</property>
- <property name="selectable">False</property>
- <property name="xalign">0</property>
- <property name="yalign">0</property>
- <property name="xpad">1</property>
- <property name="ypad">2</property>
- <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
- <property name="width_chars">-1</property>
- <property name="single_line_mode">False</property>
- <property name="angle">0</property>
- <property name="no_show_all">True</property>
- <accessibility>
- <atkproperty name="AtkObject::accessible_name" translatable="yes">Tip: Forgot your login or password? Look it up at http://red.ht/lost_password</atkproperty>
- </accessibility>
- </widget>
- <packing>
- <property name="padding">0</property>
- <property name="expand">False</property>
- <property name="fill">False</property>
- </packing>
- </child>
-
- <child>
- <placeholder/>
- </child>
- </widget>
- <packing>
- <property name="left_attach">1</property>
- <property name="right_attach">2</property>
- <property name="top_attach">2</property>
- <property name="bottom_attach">3</property>
- </packing>
- </child>
-
- <child>
<widget class="GtkEntry" id="loginUserEntry">
<property name="visible">True</property>
<property name="can_focus">True</property>
@@ -674,7 +481,7 @@ You may access the software update tool by running <b>Software Update</
<child>
<widget class="GtkLabel" id="loginPasswordEntryLabel">
<property name="visible">True</property>
- <property name="label" translatable="yes" context="yes">_Password:</property>
+ <property name="label" translatable="yes">_Password:</property>
<property name="use_underline">True</property>
<property name="use_markup">True</property>
<property name="justify">GTK_JUSTIFY_LEFT</property>
@@ -703,7 +510,7 @@ You may access the software update tool by running <b>Software Update</
<child>
<widget class="GtkLabel" id="loginUserEntryLabel">
<property name="visible">True</property>
- <property name="label" translatable="yes" context="yes">_Login:</property>
+ <property name="label" translatable="yes">_Login:</property>
<property name="use_underline">True</property>
<property name="use_markup">True</property>
<property name="justify">GTK_JUSTIFY_LEFT</property>
@@ -774,7 +581,6 @@ You may access the software update tool by running <b>Software Update</
<property name="yalign">0.5</property>
<property name="xpad">0</property>
<property name="ypad">0</property>
- <property name="no_show_all">True</property>
</widget>
<packing>
<property name="padding">0</property>
@@ -785,7 +591,7 @@ You may access the software update tool by running <b>Software Update</
<child>
<widget class="GtkLabel" id="forgotInfoSatellite">
- <property name="label" translatable="yes" context="yes"><small>Tip: Forgot your login or password? Contact your Satellite's <i>Organization Administrator</i>.</small></property>
+ <property name="label" translatable="yes"><small>Tip: Forgot your login or password? Contact your Satellite's <i>Organization Administrator</i>.</small></property>
<property name="use_underline">False</property>
<property name="use_markup">True</property>
<property name="justify">GTK_JUSTIFY_LEFT</property>
@@ -799,7 +605,6 @@ You may access the software update tool by running <b>Software Update</
<property name="width_chars">-1</property>
<property name="single_line_mode">False</property>
<property name="angle">0</property>
- <property name="no_show_all">True</property>
</widget>
<packing>
<property name="padding">0</property>
@@ -860,7 +665,7 @@ You may access the software update tool by running <b>Software Update</
<child>
<widget class="GtkLabel" id="versionTag">
<property name="visible">True</property>
- <property name="label" translatable="yes" context="yes">Red Hat Linux Version:</property>
+ <property name="label" translatable="yes">Red Hat Linux Version:</property>
<property name="use_underline">False</property>
<property name="use_markup">False</property>
<property name="justify">GTK_JUSTIFY_RIGHT</property>
@@ -876,6 +681,10 @@ You may access the software update tool by running <b>Software Update</
<property name="angle">0</property>
</widget>
<packing>
+ <property name="left_attach">0</property>
+ <property name="right_attach">1</property>
+ <property name="top_attach">0</property>
+ <property name="bottom_attach">1</property>
<property name="x_options">fill</property>
<property name="y_options">fill</property>
</packing>
@@ -884,7 +693,7 @@ You may access the software update tool by running <b>Software Update</
<child>
<widget class="GtkLabel" id="hostnameTag">
<property name="visible">True</property>
- <property name="label" translatable="yes" context="yes">Hostname:</property>
+ <property name="label" translatable="yes">Hostname:</property>
<property name="use_underline">False</property>
<property name="use_markup">False</property>
<property name="justify">GTK_JUSTIFY_RIGHT</property>
@@ -900,6 +709,8 @@ You may access the software update tool by running <b>Software Update</
<property name="angle">0</property>
</widget>
<packing>
+ <property name="left_attach">0</property>
+ <property name="right_attach">1</property>
<property name="top_attach">1</property>
<property name="bottom_attach">2</property>
<property name="x_options">fill</property>
@@ -910,7 +721,7 @@ You may access the software update tool by running <b>Software Update</
<child>
<widget class="GtkLabel" id="ipTag">
<property name="visible">True</property>
- <property name="label" translatable="yes" context="yes">IP Address:</property>
+ <property name="label" translatable="yes">IP Address:</property>
<property name="use_underline">False</property>
<property name="use_markup">False</property>
<property name="justify">GTK_JUSTIFY_RIGHT</property>
@@ -926,6 +737,8 @@ You may access the software update tool by running <b>Software Update</
<property name="angle">0</property>
</widget>
<packing>
+ <property name="left_attach">0</property>
+ <property name="right_attach">1</property>
<property name="top_attach">2</property>
<property name="bottom_attach">3</property>
<property name="x_options">fill</property>
@@ -936,7 +749,7 @@ You may access the software update tool by running <b>Software Update</
<child>
<widget class="GtkLabel" id="ipLabel">
<property name="visible">True</property>
- <property name="label" translatable="yes" context="yes">ERROR</property>
+ <property name="label" translatable="yes">ERROR</property>
<property name="use_underline">False</property>
<property name="use_markup">False</property>
<property name="justify">GTK_JUSTIFY_LEFT</property>
@@ -964,7 +777,7 @@ You may access the software update tool by running <b>Software Update</
<child>
<widget class="GtkLabel" id="hostnameLabel">
<property name="visible">True</property>
- <property name="label" translatable="yes" context="yes">ERROR</property>
+ <property name="label" translatable="yes">ERROR</property>
<property name="use_underline">False</property>
<property name="use_markup">False</property>
<property name="justify">GTK_JUSTIFY_LEFT</property>
@@ -992,7 +805,7 @@ You may access the software update tool by running <b>Software Update</
<child>
<widget class="GtkLabel" id="versionLabel">
<property name="visible">True</property>
- <property name="label" translatable="yes" context="yes">ERROR</property>
+ <property name="label" translatable="yes">ERROR</property>
<property name="use_underline">False</property>
<property name="use_markup">False</property>
<property name="justify">GTK_JUSTIFY_LEFT</property>
@@ -1010,6 +823,8 @@ You may access the software update tool by running <b>Software Update</
<packing>
<property name="left_attach">1</property>
<property name="right_attach">2</property>
+ <property name="top_attach">0</property>
+ <property name="bottom_attach">1</property>
<property name="x_options">fill</property>
<property name="y_options">fill</property>
</packing>
@@ -1018,7 +833,7 @@ You may access the software update tool by running <b>Software Update</
<child>
<widget class="GtkLabel" id="cpuTag">
<property name="visible">True</property>
- <property name="label" translatable="yes" context="yes">CPU Model:</property>
+ <property name="label" translatable="yes">CPU Model:</property>
<property name="use_underline">False</property>
<property name="use_markup">False</property>
<property name="justify">GTK_JUSTIFY_CENTER</property>
@@ -1034,6 +849,8 @@ You may access the software update tool by running <b>Software Update</
<property name="angle">0</property>
</widget>
<packing>
+ <property name="left_attach">0</property>
+ <property name="right_attach">1</property>
<property name="top_attach">3</property>
<property name="bottom_attach">4</property>
<property name="x_options">fill</property>
@@ -1044,7 +861,7 @@ You may access the software update tool by running <b>Software Update</
<child>
<widget class="GtkLabel" id="speedTag">
<property name="visible">True</property>
- <property name="label" translatable="yes" context="yes">CPU Speed:</property>
+ <property name="label" translatable="yes">CPU Speed:</property>
<property name="use_underline">False</property>
<property name="use_markup">False</property>
<property name="justify">GTK_JUSTIFY_CENTER</property>
@@ -1060,6 +877,8 @@ You may access the software update tool by running <b>Software Update</
<property name="angle">0</property>
</widget>
<packing>
+ <property name="left_attach">0</property>
+ <property name="right_attach">1</property>
<property name="top_attach">4</property>
<property name="bottom_attach">5</property>
<property name="x_options">fill</property>
@@ -1070,7 +889,7 @@ You may access the software update tool by running <b>Software Update</
<child>
<widget class="GtkLabel" id="ramTag">
<property name="visible">True</property>
- <property name="label" translatable="yes" context="yes">Memory:</property>
+ <property name="label" translatable="yes">Memory:</property>
<property name="use_underline">False</property>
<property name="use_markup">False</property>
<property name="justify">GTK_JUSTIFY_CENTER</property>
@@ -1086,6 +905,8 @@ You may access the software update tool by running <b>Software Update</
<property name="angle">0</property>
</widget>
<packing>
+ <property name="left_attach">0</property>
+ <property name="right_attach">1</property>
<property name="top_attach">5</property>
<property name="bottom_attach">6</property>
<property name="x_options">fill</property>
@@ -1096,7 +917,7 @@ You may access the software update tool by running <b>Software Update</
<child>
<widget class="GtkLabel" id="cpuLabel">
<property name="visible">True</property>
- <property name="label" translatable="yes" context="yes">ERROR</property>
+ <property name="label" translatable="yes">ERROR</property>
<property name="use_underline">False</property>
<property name="use_markup">False</property>
<property name="justify">GTK_JUSTIFY_LEFT</property>
@@ -1124,7 +945,7 @@ You may access the software update tool by running <b>Software Update</
<child>
<widget class="GtkLabel" id="speedLabel">
<property name="visible">True</property>
- <property name="label" translatable="yes" context="yes">ERROR</property>
+ <property name="label" translatable="yes">ERROR</property>
<property name="use_underline">False</property>
<property name="use_markup">False</property>
<property name="justify">GTK_JUSTIFY_LEFT</property>
@@ -1152,7 +973,7 @@ You may access the software update tool by running <b>Software Update</
<child>
<widget class="GtkLabel" id="ramLabel">
<property name="visible">True</property>
- <property name="label" translatable="yes" context="yes">ERROR</property>
+ <property name="label" translatable="yes">ERROR</property>
<property name="use_underline">False</property>
<property name="use_markup">False</property>
<property name="justify">GTK_JUSTIFY_LEFT</property>
@@ -1182,7 +1003,7 @@ You may access the software update tool by running <b>Software Update</
<child>
<widget class="GtkLabel" id="label82">
<property name="visible">True</property>
- <property name="label" translatable="yes" context="yes">Hardware Profile</property>
+ <property name="label" translatable="yes">Hardware Profile</property>
<property name="use_underline">False</property>
<property name="use_markup">False</property>
<property name="justify">GTK_JUSTIFY_LEFT</property>
@@ -1297,7 +1118,7 @@ You may access the software update tool by running <b>Software Update</
<child>
<widget class="GtkLabel" id="packageDialogFrameLabel">
<property name="visible">True</property>
- <property name="label" translatable="yes" context="yes">Package Information</property>
+ <property name="label" translatable="yes">Package Information</property>
<property name="use_underline">False</property>
<property name="use_markup">False</property>
<property name="justify">GTK_JUSTIFY_LEFT</property>
@@ -1380,7 +1201,7 @@ You may access the software update tool by running <b>Software Update</
<child>
<widget class="GtkLabel" id="label98">
<property name="visible">True</property>
- <property name="label" translatable="yes" context="yes">This assistant will guide you through the process of registering your system with Red Hat to receive software updates and other benefits. You will need the following to register:</property>
+ <property name="label" translatable="yes">This assistant will guide you through the process of registering your system with Red Hat to receive software updates and other benefits. You will need the following to register:</property>
<property name="use_underline">False</property>
<property name="use_markup">False</property>
<property name="justify">GTK_JUSTIFY_LEFT</property>
@@ -1394,9 +1215,9 @@ You may access the software update tool by running <b>Software Update</
<property name="width_chars">-1</property>
<property name="single_line_mode">False</property>
<property name="angle">0</property>
- <accessibility>
- <atkproperty name="AtkObject::accessible_name" translatable="yes">This assistant will guide you through the process of registering your system with Red Hat to receive software updates and other benefits. You will need the following to register:</atkproperty>
- </accessibility>
+ <accessibility>
+ <atkproperty name="AtkObject::accessible_name" translatable="yes">This assistant will guide you through the process of registering your system with Red Hat to receive software updates and other benefits. You will need the following to register:</atkproperty>
+ </accessibility>
</widget>
<packing>
<property name="padding">0</property>
@@ -1426,7 +1247,7 @@ You may access the software update tool by running <b>Software Update</
<child>
<widget class="GtkLabel" id="label35">
<property name="visible">True</property>
- <property name="label" translatable="yes" context="yes">• A network connection</property>
+ <property name="label" translatable="yes">• A network connection</property>
<property name="use_underline">False</property>
<property name="use_markup">False</property>
<property name="justify">GTK_JUSTIFY_LEFT</property>
@@ -1451,7 +1272,7 @@ You may access the software update tool by running <b>Software Update</
<child>
<widget class="GtkLabel" id="label36">
<property name="visible">True</property>
- <property name="label" translatable="yes" context="yes">• Your Red Hat account login</property>
+ <property name="label" translatable="yes">• Your account login</property>
<property name="use_underline">False</property>
<property name="use_markup">False</property>
<property name="justify">GTK_JUSTIFY_LEFT</property>
@@ -1465,9 +1286,9 @@ You may access the software update tool by running <b>Software Update</
<property name="width_chars">-1</property>
<property name="single_line_mode">False</property>
<property name="angle">0</property>
- <accessibility>
- <atkproperty name="AtkObject::accessible_name" translatable="yes">Your Red Hat account login</atkproperty>
- </accessibility>
+ <accessibility>
+ <atkproperty name="AtkObject::accessible_name" translatable="yes">Your account login</atkproperty>
+ </accessibility>
</widget>
<packing>
<property name="padding">0</property>
@@ -1477,9 +1298,9 @@ You may access the software update tool by running <b>Software Update</
</child>
<child>
- <widget class="GtkLabel" id="label37">
+ <widget class="GtkLabel" id="label152">
<property name="visible">True</property>
- <property name="label" translatable="yes" context="yes">• A Red Hat subscription that covers your product</property>
+ <property name="label" translatable="yes">• The address of an RHN Satellite or RHN Proxy</property>
<property name="use_underline">False</property>
<property name="use_markup">False</property>
<property name="justify">GTK_JUSTIFY_LEFT</property>
@@ -1493,9 +1314,6 @@ You may access the software update tool by running <b>Software Update</
<property name="width_chars">-1</property>
<property name="single_line_mode">False</property>
<property name="angle">0</property>
- <accessibility>
- <atkproperty name="AtkObject::accessible_name" translatable="yes">A Red Hat subscription that covers your product</atkproperty>
- </accessibility>
</widget>
<packing>
<property name="padding">0</property>
@@ -1503,64 +1321,6 @@ You may access the software update tool by running <b>Software Update</
<property name="fill">True</property>
</packing>
</child>
- <child>
- <widget class="GtkHBox" id="hbox34">
- <property name="visible">True</property>
- <property name="homogeneous">False</property>
- <property name="spacing">0</property>
-
- <child>
- <widget class="GtkLabel" id="label143">
- <property name="visible">True</property>
- <property name="label" translatable="yes" context="yes">• (optional) The address of an alternate service</property>
- <property name="use_underline">False</property>
- <property name="use_markup">False</property>
- <property name="justify">GTK_JUSTIFY_LEFT</property>
- <property name="wrap">False</property>
- <property name="selectable">False</property>
- <property name="xalign">0</property>
- <property name="yalign">0.5</property>
- <property name="xpad">0</property>
- <property name="ypad">0</property>+ <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
- <property name="width_chars">-1</property>
- <property name="single_line_mode">False</property>
- <property name="angle">0</property>
- <accessibility>
- <atkproperty name="AtkObject::accessible_name" translatable="yes">(optional) The address of an alternate service</atkproperty>
- </accessibility>
- </widget>
- <packing>
- <property name="padding">0</property>
- <property name="expand">False</property>
- <property name="fill">False</property>
- </packing>
- </child>
-
- <child>
- <widget class="GtkButton" id="MoreInfoButton">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="label" translatable="yes">_More Info</property>
- <property name="use_underline">True</property>+ <property name="relief">GTK_RELIEF_NORMAL</property>
- <property name="focus_on_click">True</property>
- <accessibility>
- <atkproperty name="AtkObject::accessible_name" translatable="yes">More Info</atkproperty>
- </accessibility>
- <signal name="clicked" handler="onMoreInfoButtonClicked"/>
- </widget>
- <packing>
- <property name="padding">20</property>
- <property name="expand">False</property>
- <property name="fill">False</property>
- </packing>
- </child>
- </widget>
- <packing>
- <property name="padding">0</property>
- <property name="expand">False</property>
- <property name="fill">False</property>
- </packing>
- </child>
</widget>
</child>
</widget>
@@ -1581,13 +1341,13 @@ You may access the software update tool by running <b>Software Update</
<widget class="GtkButton" id="whyRegisterButton">
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="label" translatable="yes" context="yes">_Why Should I Register?</property>
+ <property name="label" translatable="yes">_Why Should I Register?</property>
<property name="use_underline">True</property>
<property name="relief">GTK_RELIEF_NORMAL</property>
<property name="focus_on_click">True</property>
- <accessibility>
- <atkproperty name="AtkObject::accessible_name" translatable="yes">Why Should I Register?</atkproperty>
- </accessibility>
+ <accessibility>
+ <atkproperty name="AtkObject::accessible_name" translatable="yes">Why Should I Register?</atkproperty>
+ </accessibility>
<signal name="clicked" handler="onWhyRegisterButtonClicked"/>
</widget>
<packing>
@@ -1618,7 +1378,7 @@ You may access the software update tool by running <b>Software Update</
<child>
<widget class="GtkLabel" id="label57">
<property name="visible">True</property>
- <property name="label" translatable="yes" context="yes">Would you like to register your system at this time? <b>(Strongly recommended.)</b></property>
+ <property name="label" translatable="yes">Would you like to register your system at this time? <b>(Strongly recommended.)</b></property>
<property name="use_underline">False</property>
<property name="use_markup">True</property>
<property name="justify">GTK_JUSTIFY_LEFT</property>
@@ -1643,7 +1403,7 @@ You may access the software update tool by running <b>Software Update</
<child>
<widget class="GtkRadioButton" id="registerNowButton">
<property name="visible">True</property>
- <property name="label" translatable="yes" context="yes">_Yes, I'd like to register now.</property>
+ <property name="label" translatable="yes">_Yes, I'd like to register now.</property>
<property name="use_underline">True</property>
<property name="relief">GTK_RELIEF_NORMAL</property>
<property name="focus_on_click">True</property>
@@ -1661,7 +1421,7 @@ You may access the software update tool by running <b>Software Update</
<child>
<widget class="GtkRadioButton" id="dontRegisterButton">
<property name="visible">True</property>
- <property name="label" translatable="yes" context="yes">_No, I prefer to register at a later time.</property>
+ <property name="label" translatable="yes">_No, I prefer to register at a later time.</property>
<property name="use_underline">True</property>
<property name="relief">GTK_RELIEF_NORMAL</property>
<property name="focus_on_click">True</property>
@@ -1713,7 +1473,7 @@ You may access the software update tool by running <b>Software Update</
<child>
<widget class="GtkLabel" id="label105">
<property name="visible">True</property>
- <property name="label" translatable="yes" context="yes">Your system will need to access a subscription. This will allow you to keep your system updated, secure, and supported.</property>
+ <property name="label" translatable="yes">Your system will need to access a subscription. This will allow you to keep your system updated, secure, and supported.</property>
<property name="use_underline">False</property>
<property name="use_markup">False</property>
<property name="justify">GTK_JUSTIFY_LEFT</property>
@@ -1778,7 +1538,7 @@ You may access the software update tool by running <b>Software Update</
<child>
<widget class="GtkLabel" id="label9">
<property name="visible">True</property>
- <property name="label" translatable="yes" context="yes">Purchase an additional Red Hat Enterprise Linux subscription at http://www.redhat.com/store/.</property>
+ <property name="label" translatable="yes">Purchase an additional Red Hat Enterprise Linux subscription at http://www.redhat.com/store/.</property>
<property name="use_underline">False</property>
<property name="use_markup">False</property>
<property name="justify">GTK_JUSTIFY_LEFT</property>
@@ -1805,7 +1565,7 @@ You may access the software update tool by running <b>Software Update</
<child>
<widget class="GtkLabel" id="label8">
<property name="visible">True</property>
- <property name="label" translatable="yes" context="yes">Log in to http://rhn.redhat.com/ and unentitle an inactive system at Your RHN > Subscription Management > System Entitlements.</property>
+ <property name="label" translatable="yes">Log in to http://rhn.redhat.com/ and unentitle an inactive system at Your RHN > Subscription Management > System Entitlements.</property>
<property name="use_underline">False</property>
<property name="use_markup">False</property>
<property name="justify">GTK_JUSTIFY_LEFT</property>
@@ -1832,7 +1592,7 @@ You may access the software update tool by running <b>Software Update</
<child>
<widget class="GtkLabel" id="label17">
<property name="visible">True</property>
- <property name="label" translatable="yes" context="yes">Activate a previously purchased subscription you have not yet activated.</property>
+ <property name="label" translatable="yes">Activate a previously purchased subscription you have not yet activated.</property>
<property name="use_underline">False</property>
<property name="use_markup">False</property>
<property name="justify">GTK_JUSTIFY_LEFT</property>
@@ -1860,7 +1620,7 @@ You may access the software update tool by running <b>Software Update</
<child>
<widget class="GtkLabel" id="label38">
<property name="visible">True</property>
- <property name="label" translatable="yes" context="yes">•</property>
+ <property name="label" translatable="yes">•</property>
<property name="use_underline">False</property>
<property name="use_markup">False</property>
<property name="justify">GTK_JUSTIFY_LEFT</property>
@@ -1888,7 +1648,7 @@ You may access the software update tool by running <b>Software Update</
<child>
<widget class="GtkLabel" id="label39">
<property name="visible">True</property>
- <property name="label" translatable="yes" context="yes">•</property>
+ <property name="label" translatable="yes">•</property>
<property name="use_underline">False</property>
<property name="use_markup">False</property>
<property name="justify">GTK_JUSTIFY_LEFT</property>
@@ -1916,7 +1676,7 @@ You may access the software update tool by running <b>Software Update</
<child>
<widget class="GtkLabel" id="label40">
<property name="visible">True</property>
- <property name="label" translatable="yes" context="yes">•</property>
+ <property name="label" translatable="yes">•</property>
<property name="use_underline">False</property>
<property name="use_markup">False</property>
<property name="justify">GTK_JUSTIFY_LEFT</property>
@@ -2089,7 +1849,7 @@ You may access the software update tool by running <b>Software Update</
<child>
<widget class="GtkLabel" id="label15">
<property name="visible">True</property>
- <property name="label" translatable="yes" context="yes">Installation _Number:</property>
+ <property name="label" translatable="yes">Installation _Number:</property>
<property name="use_underline">True</property>
<property name="use_markup">False</property>
<property name="justify">GTK_JUSTIFY_LEFT</property>
@@ -2140,7 +1900,7 @@ You may access the software update tool by running <b>Software Update</
<child>
<widget class="GtkLabel" id="label10">
<property name="visible">True</property>
- <property name="label" translatable="yes" context="yes"><small><b>Example</b>: XXXX-XXXX-XXXX-XXXX</small></property>
+ <property name="label" translatable="yes"><small><b>Example</b>: XXXX-XXXX-XXXX-XXXX</small></property>
<property name="use_underline">False</property>
<property name="use_markup">True</property>
<property name="justify">GTK_JUSTIFY_LEFT</property>
@@ -2239,7 +1999,7 @@ You may access the software update tool by running <b>Software Update</
<child>
<widget class="GtkLabel" id="reviewSubscriptionLabel">
<property name="visible">True</property>
- <property name="label" translatable="yes" context="yes">Please review the subscription details below:</property>
+ <property name="label" translatable="yes">Please review the subscription details below:</property>
<property name="use_underline">False</property>
<property name="use_markup">True</property>
<property name="justify">GTK_JUSTIFY_LEFT</property>
@@ -2344,7 +2104,7 @@ You may access the software update tool by running <b>Software Update</
<child>
<widget class="GtkLabel" id="label113">
<property name="visible">True</property>
- <property name="label" translatable="yes" context="yes"><big><b>System Name</b></big></property>
+ <property name="label" translatable="yes"><big><b>System Name</b></big></property>
<property name="use_underline">False</property>
<property name="use_markup">True</property>
<property name="justify">GTK_JUSTIFY_LEFT</property>
@@ -2387,7 +2147,7 @@ You may access the software update tool by running <b>Software Update</
<child>
<widget class="GtkLabel" id="label115">
<property name="visible">True</property>
- <property name="label" translatable="yes" context="yes">A recognizable name will help you identify this system in a management interface.</property>
+ <property name="label" translatable="yes">A recognizable name will help you identify this system in a management interface.</property>
<property name="use_underline">False</property>
<property name="use_markup">False</property>
<property name="justify">GTK_JUSTIFY_LEFT</property>
@@ -2401,9 +2161,9 @@ You may access the software update tool by running <b>Software Update</
<property name="width_chars">-1</property>
<property name="single_line_mode">False</property>
<property name="angle">0</property>
- <accessibility>
- <atkproperty name="AtkObject::accessible_name" translatable="yes">A recognizable name will help you identify this system in a management interface.</atkproperty>
- </accessibility>
+ <accessibility>
+ <atkproperty name="AtkObject::accessible_name" translatable="yes">A recognizable name will help you identify this system in a management interface.</atkproperty>
+ </accessibility>
</widget>
<packing>
<property name="padding">0</property>
@@ -2421,7 +2181,7 @@ You may access the software update tool by running <b>Software Update</
<child>
<widget class="GtkLabel" id="label116">
<property name="visible">True</property>
- <property name="label" translatable="yes" context="yes">System _Name:</property>
+ <property name="label" translatable="yes">System _Name:</property>
<property name="use_underline">True</property>
<property name="use_markup">False</property>
<property name="justify">GTK_JUSTIFY_LEFT</property>
@@ -2498,7 +2258,7 @@ You may access the software update tool by running <b>Software Update</
<child>
<widget class="GtkLabel" id="label117">
<property name="visible">True</property>
- <property name="label" translatable="yes" context="yes"><big><b>Profile Data</b></big></property>
+ <property name="label" translatable="yes"><big><b>Profile Data</b></big></property>
<property name="use_underline">False</property>
<property name="use_markup">True</property>
<property name="justify">GTK_JUSTIFY_LEFT</property>
@@ -2541,7 +2301,7 @@ You may access the software update tool by running <b>Software Update</
<child>
<widget class="GtkLabel" id="label118">
<property name="visible">True</property>
- <property name="label" translatable="yes" context="yes">Send us a profile of your current hardware and packages so we can determine what updates are available.</property>
+ <property name="label" translatable="yes">Send us a profile of your current hardware and packages so we can determine what updates are available.</property>
<property name="use_underline">False</property>
<property name="use_markup">False</property>
<property name="justify">GTK_JUSTIFY_LEFT</property>
@@ -2555,9 +2315,9 @@ You may access the software update tool by running <b>Software Update</
<property name="width_chars">-1</property>
<property name="single_line_mode">False</property>
<property name="angle">0</property>
- <accessibility>
- <atkproperty name="AtkObject::accessible_name" translatable="yes">Send us a profile of your current hardware and packages so we can determine what updates are available.</atkproperty>
- </accessibility>
+ <accessibility>
+ <atkproperty name="AtkObject::accessible_name" translatable="yes">Send us a profile of your current hardware and packages so we can determine what updates are available.</atkproperty>
+ </accessibility>
</widget>
<packing>
<property name="padding">0</property>
@@ -2579,7 +2339,7 @@ You may access the software update tool by running <b>Software Update</
<widget class="GtkButton" id="viewHardwareButton">
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="label" translatable="yes" context="yes">_View Hardware Profile ...</property>
+ <property name="label" translatable="yes">_View Hardware Profile ...</property>
<property name="use_underline">True</property>
<property name="relief">GTK_RELIEF_NORMAL</property>
<property name="focus_on_click">True</property>
@@ -2602,7 +2362,7 @@ You may access the software update tool by running <b>Software Update</
<widget class="GtkButton" id="viewPackageListButton">
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="label" translatable="yes" context="yes">V_iew Package Profile ...</property>
+ <property name="label" translatable="yes">V_iew Package Profile ...</property>
<property name="use_underline">True</property>
<property name="relief">GTK_RELIEF_NORMAL</property>
<property name="focus_on_click">True</property>
@@ -2625,7 +2385,7 @@ You may access the software update tool by running <b>Software Update</
<widget class="GtkCheckButton" id="sendHardwareButton">
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="label" translatable="yes" context="yes">Send _hardware profile</property>
+ <property name="label" translatable="yes">Send _hardware profile</property>
<property name="use_underline">True</property>
<property name="relief">GTK_RELIEF_NORMAL</property>
<property name="focus_on_click">True</property>
@@ -2650,7 +2410,7 @@ You may access the software update tool by running <b>Software Update</
<widget class="GtkCheckButton" id="sendPackageListButton">
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="label" translatable="yes" context="yes">Send _package profile</property>
+ <property name="label" translatable="yes">Send _package profile</property>
<property name="use_underline">True</property>
<property name="relief">GTK_RELIEF_NORMAL</property>
<property name="focus_on_click">True</property>
@@ -2724,8 +2484,9 @@ You may access the software update tool by running <b>Software Update</
<child>
<widget class="GtkLabel" id="label119">
+ <property name="width_request">600</property>
<property name="visible">True</property>
- <property name="label" translatable="yes" context="yes">Registering your system with Red Hat allows you to take full advantage of the benefits of a paid subscription, including:</property>
+ <property name="label" translatable="yes">Registering your system with Red Hat allows you to take full advantage of the benefits of a paid subscription, including:</property>
<property name="use_underline">False</property>
<property name="use_markup">False</property>
<property name="justify">GTK_JUSTIFY_LEFT</property>
@@ -2736,12 +2497,12 @@ You may access the software update tool by running <b>Software Update</
<property name="xpad">0</property>
<property name="ypad">0</property>
<property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
- <property name="width_request">600</property>
+ <property name="width_chars">-1</property>
<property name="single_line_mode">False</property>
<property name="angle">0</property>
- <accessibility>
- <atkproperty name="AtkObject::accessible_name" translatable="yes">Registering your system with Red Hat allows you to take full advantage of the benefits of a paid subscription, including:</atkproperty>
- </accessibility>
+ <accessibility>
+ <atkproperty name="AtkObject::accessible_name" translatable="yes">Registering your system with Red Hat allows you to take full advantage of the benefits of a paid subscription, including:</atkproperty>
+ </accessibility>
</widget>
<packing>
<property name="padding">0</property>
@@ -2764,7 +2525,7 @@ You may access the software update tool by running <b>Software Update</
<widget class="GtkButton" id="backToRegistrationButton">
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="label" translatable="yes" context="yes">_Close</property>
+ <property name="label" translatable="yes">_Close</property>
<property name="use_underline">True</property>
<property name="relief">GTK_RELIEF_NORMAL</property>
<property name="focus_on_click">True</property>
@@ -2810,7 +2571,7 @@ You may access the software update tool by running <b>Software Update</
<child>
<widget class="GtkLabel" id="label61">
<property name="visible">True</property>
- <property name="label" translatable="yes" context="yes"><b>Security &amp; Updates:</b></property>
+ <property name="label" translatable="yes"><b>Security &amp; Updates:</b></property>
<property name="use_underline">False</property>
<property name="use_markup">True</property>
<property name="justify">GTK_JUSTIFY_LEFT</property>
@@ -2869,8 +2630,9 @@ You may access the software update tool by running <b>Software Update</
<child>
<widget class="GtkLabel" id="label62">
+ <property name="width_request">460</property>
<property name="visible">True</property>
- <property name="label" translatable="yes" context="yes">Receive the latest software updates, including security updates, keeping this Red Hat Enterprise Linux system <b>updated</b> and <b>secure</b>.</property>
+ <property name="label" translatable="yes">Receive the latest software updates, including security updates, keeping this Red Hat Enterprise Linux system <b>updated</b> and <b>secure</b>.</property>
<property name="use_underline">False</property>
<property name="use_markup">True</property>
<property name="justify">GTK_JUSTIFY_LEFT</property>
@@ -2881,7 +2643,7 @@ You may access the software update tool by running <b>Software Update</
<property name="xpad">0</property>
<property name="ypad">0</property>
<property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
- <property name="width_request">460</property>
+ <property name="width_chars">-1</property>
<property name="single_line_mode">False</property>
<property name="angle">0</property>
</widget>
@@ -2904,7 +2666,7 @@ You may access the software update tool by running <b>Software Update</
<child>
<widget class="GtkLabel" id="label63">
<property name="visible">True</property>
- <property name="label" translatable="yes" context="yes"><b>Downloads &amp; Upgrades:</b></property>
+ <property name="label" translatable="yes"><b>Downloads &amp; Upgrades:</b></property>
<property name="use_underline">False</property>
<property name="use_markup">True</property>
<property name="justify">GTK_JUSTIFY_LEFT</property>
@@ -2963,8 +2725,9 @@ You may access the software update tool by running <b>Software Update</
<child>
<widget class="GtkLabel" id="label64">
+ <property name="width_request">460</property>
<property name="visible">True</property>
- <property name="label" translatable="yes" context="yes">Download installation images for Red Hat Enterprise Linux releases, including new releases.</property>
+ <property name="label" translatable="yes">Download installation images for Red Hat Enterprise Linux releases, including new releases.</property>
<property name="use_underline">False</property>
<property name="use_markup">True</property>
<property name="justify">GTK_JUSTIFY_LEFT</property>
@@ -2975,7 +2738,7 @@ You may access the software update tool by running <b>Software Update</
<property name="xpad">0</property>
<property name="ypad">0</property>
<property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
- <property name="width_request">460</property>
+ <property name="width_chars">-1</property>
<property name="single_line_mode">False</property>
<property name="angle">0</property>
</widget>
@@ -2998,7 +2761,7 @@ You may access the software update tool by running <b>Software Update</
<child>
<widget class="GtkLabel" id="label65">
<property name="visible">True</property>
- <property name="label" translatable="yes" context="yes"><b>Support:</b></property>
+ <property name="label" translatable="yes"><b>Support:</b></property>
<property name="use_underline">False</property>
<property name="use_markup">True</property>
<property name="justify">GTK_JUSTIFY_LEFT</property>
@@ -3057,8 +2820,9 @@ You may access the software update tool by running <b>Software Update</
<child>
<widget class="GtkLabel" id="label66">
+ <property name="width_request">460</property>
<property name="visible">True</property>
- <property name="label" translatable="yes" context="yes">Access to the technical support experts at Red Hat or Red Hat's partners for help with any issues you might encounter with this system.</property>
+ <property name="label" translatable="yes">Access to the technical support experts at Red Hat or Red Hat's partners for help with any issues you might encounter with this system.</property>
<property name="use_underline">False</property>
<property name="use_markup">True</property>
<property name="justify">GTK_JUSTIFY_LEFT</property>
@@ -3069,7 +2833,7 @@ You may access the software update tool by running <b>Software Update</
<property name="xpad">0</property>
<property name="ypad">0</property>
<property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
- <property name="width_request">460</property>
+ <property name="width_chars">-1</property>
<property name="single_line_mode">False</property>
<property name="angle">0</property>
</widget>
@@ -3092,7 +2856,7 @@ You may access the software update tool by running <b>Software Update</
<child>
<widget class="GtkLabel" id="label67">
<property name="visible">True</property>
- <property name="label" translatable="yes" context="yes"><b>Management:</b></property>
+ <property name="label" translatable="yes"><b>Management:</b></property>
<property name="use_underline">False</property>
<property name="use_markup">True</property>
<property name="justify">GTK_JUSTIFY_LEFT</property>
@@ -3106,9 +2870,9 @@ You may access the software update tool by running <b>Software Update</
<property name="width_chars">-1</property>
<property name="single_line_mode">False</property>
<property name="angle">0</property>
- <accessibility>
- <atkproperty name="AtkObject::accessible_name" translatable="yes">Management</atkproperty>
- </accessibility>
+ <accessibility>
+ <atkproperty name="AtkObject::accessible_name" translatable="yes">Management</atkproperty>
+ </accessibility>
</widget>
<packing>
<property name="padding">0</property>
@@ -3154,8 +2918,9 @@ You may access the software update tool by running <b>Software Update</
<child>
<widget class="GtkLabel" id="label68">
+ <property name="width_request">460</property>
<property name="visible">True</property>
- <property name="label" translatable="yes" context="yes">Manage subscriptions and systems registered to Customer Portal via access.redhat.com or through one of our other subscription management services.</property>
+ <property name="label" translatable="yes">Manage subscriptions and systems registered to Customer Portal via access.redhat.com or through one of our other subscription management services.</property>
<property name="use_underline">False</property>
<property name="use_markup">True</property>
<property name="justify">GTK_JUSTIFY_LEFT</property>
@@ -3166,12 +2931,12 @@ You may access the software update tool by running <b>Software Update</
<property name="xpad">0</property>
<property name="ypad">0</property>
<property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
- <property name="width_request">460</property>
+ <property name="width_chars">-1</property>
<property name="single_line_mode">False</property>
<property name="angle">0</property>
- <accessibility>
- <atkproperty name="AtkObject::accessible_name" translatable="yes">Manage subscriptions and systems registered to Customer Portal via access.redhat.com or through one of our other subscription management services.</atkproperty>
- </accessibility>
+ <accessibility>
+ <atkproperty name="AtkObject::accessible_name" translatable="yes">Manage subscriptions and systems registered to Customer Portal via access.redhat.com or through one of our other subscription management services.</atkproperty>
+ </accessibility>
</widget>
<packing>
<property name="padding">0</property>
@@ -3224,7 +2989,7 @@ You may access the software update tool by running <b>Software Update</
<child>
<widget class="GtkLabel" id="label125">
<property name="visible">True</property>
- <property name="label" translatable="yes" context="yes"><small><b>Tip:</b> Red Hat values your privacy: http://www.redhat.com/legal/privacy_statement.html.</small></property>
+ <property name="label" translatable="yes"><small><b>Tip:</b> Red Hat values your privacy: http://www.redhat.com/legal/privacy_statement.html.</small></property>
<property name="use_underline">False</property>
<property name="use_markup">True</property>
<property name="justify">GTK_JUSTIFY_LEFT</property>
@@ -3283,7 +3048,7 @@ You may access the software update tool by running <b>Software Update</
<child>
<widget class="GtkLabel" id="SecurityCertLabel">
<property name="visible">True</property>
- <property name="label" translatable="yes" context="yes">A security certificate compatible with <b>%s</b> was not found on this system.
+ <property name="label" translatable="yes">A security certificate compatible with <b>%s</b> was not found on this system.
A security certificate, using SSL technology, is necessary to ensure that data communicated between this system and Red Hat Network (including your login and password) is secure.</property>
<property name="use_underline">False</property>
@@ -3326,7 +3091,7 @@ A security certificate, using SSL technology, is necessary to ensure that data c
<child>
<widget class="GtkLabel" id="label14">
<property name="visible">True</property>
- <property name="label" translatable="yes" context="yes">I have an <b>_SSL certificate</b> to communicate with Red Hat Network:</property>
+ <property name="label" translatable="yes">I have an <b>_SSL certificate</b> to communicate with Red Hat Network:</property>
<property name="use_underline">True</property>
<property name="use_markup">True</property>
<property name="justify">GTK_JUSTIFY_LEFT</property>
@@ -3375,7 +3140,7 @@ A security certificate, using SSL technology, is necessary to ensure that data c
<child>
<widget class="GtkLabel" id="label16">
<property name="visible">True</property>
- <property name="label" translatable="yes" context="yes">Certificate _Location:</property>
+ <property name="label" translatable="yes">Certificate _Location:</property>
<property name="use_underline">True</property>
<property name="use_markup">False</property>
<property name="justify">GTK_JUSTIFY_LEFT</property>
@@ -3449,7 +3214,7 @@ A security certificate, using SSL technology, is necessary to ensure that data c
<child>
<widget class="GtkLabel" id="label13">
<property name="visible">True</property>
- <property name="label" translatable="yes" context="yes">I <b>_don't</b> have an SSL certificate. I will contact my system administrator for assistance and will register at a later time.</property>
+ <property name="label" translatable="yes">I <b>_don't</b> have an SSL certificate. I will contact my system administrator for assistance and will register at a later time.</property>
<property name="use_underline">True</property>
<property name="use_markup">True</property>
<property name="justify">GTK_JUSTIFY_LEFT</property>
@@ -3529,7 +3294,7 @@ A security certificate, using SSL technology, is necessary to ensure that data c
<child>
<widget class="GtkLabel" id="label55">
<property name="visible">True</property>
- <property name="label" translatable="yes" context="yes">Your system is not setup for software updates.</property>
+ <property name="label" translatable="yes">Your system is not setup for software updates.</property>
<property name="use_underline">False</property>
<property name="use_markup">True</property>
<property name="justify">GTK_JUSTIFY_LEFT</property>
@@ -3561,7 +3326,7 @@ A security certificate, using SSL technology, is necessary to ensure that data c
<child>
<widget class="GtkLabel" id="label2">
<property name="visible">True</property>
- <property name="label" translatable="yes" context="yes">You won't be able to receive software updates, including security updates, for this system.
+ <property name="label" translatable="yes">You won't be able to receive software updates, including security updates, for this system.
You may access the RHN registration tool by running <b>RHN Registration</b> or <b>Red Hat Subscription Manager</b> in the <b>System > Administration</b> menu.
You may access the software update tool by running <b>Software Update</b> in the <b>System > Administration</b> menu.</property>
@@ -3626,7 +3391,7 @@ You may access the software update tool by running <b>Software Update</
<child>
<widget class="GtkButton" id="closeButton">
<property name="visible">True</property>
- <property name="label" translatable="yes" context="yes">_Close</property>
+ <property name="label" translatable="yes">_Close</property>
<property name="use_underline">True</property>
<property name="relief">GTK_RELIEF_NORMAL</property>
<property name="focus_on_click">True</property>
@@ -3655,7 +3420,7 @@ You may access the software update tool by running <b>Software Update</
<child>
<widget class="GtkLabel" id="label18">
<property name="visible">True</property>
- <property name="label" translatable="yes" context="yes"><b>HTTP Proxy</b></property>
+ <property name="label" translatable="yes"><b>HTTP Proxy</b></property>
<property name="use_underline">False</property>
<property name="use_markup">True</property>
<property name="justify">GTK_JUSTIFY_LEFT</property>
@@ -3698,7 +3463,7 @@ You may access the software update tool by running <b>Software Update</
<child>
<widget class="GtkCheckButton" id="enableProxyButton">
<property name="visible">True</property>
- <property name="label" translatable="yes" context="yes">I would like to connect via an _HTTP proxy.</property>
+ <property name="label" translatable="yes">I would like to connect via an _HTTP proxy.</property>
<property name="use_underline">True</property>
<property name="relief">GTK_RELIEF_NORMAL</property>
<property name="focus_on_click">True</property>
@@ -3763,7 +3528,7 @@ You may access the software update tool by running <b>Software Update</
<child>
<widget class="GtkLabel" id="label20">
<property name="visible">True</property>
- <property name="label" translatable="yes" context="yes"><small><b>Example:</b> squid.example.com:3128</small></property>
+ <property name="label" translatable="yes"><small><b>Example:</b> squid.example.com:3128</small></property>
<property name="use_underline">False</property>
<property name="use_markup">True</property>
<property name="justify">GTK_JUSTIFY_LEFT</property>
@@ -3796,7 +3561,7 @@ You may access the software update tool by running <b>Software Update</
<child>
<widget class="GtkLabel" id="label19">
<property name="visible">True</property>
- <property name="label" translatable="yes" context="yes">_Proxy Location:</property>
+ <property name="label" translatable="yes">_Proxy Location:</property>
<property name="use_underline">True</property>
<property name="use_markup">False</property>
<property name="justify">GTK_JUSTIFY_LEFT</property>
@@ -3861,7 +3626,7 @@ You may access the software update tool by running <b>Software Update</
<child>
<widget class="GtkCheckButton" id="enableProxyAuthButton">
<property name="visible">True</property>
- <property name="label" translatable="yes" context="yes">Use Au_thentication with HTTP Proxy:</property>
+ <property name="label" translatable="yes">Use Au_thentication with HTTP Proxy:</property>
<property name="use_underline">True</property>
<property name="relief">GTK_RELIEF_NORMAL</property>
<property name="focus_on_click">True</property>
@@ -3904,7 +3669,7 @@ You may access the software update tool by running <b>Software Update</
<widget class="GtkLabel" id="usernameLabel">
<property name="visible">True</property>
<property name="sensitive">False</property>
- <property name="label" translatable="yes" context="yes">Proxy _Username:</property>
+ <property name="label" translatable="yes">Proxy _Username:</property>
<property name="use_underline">True</property>
<property name="use_markup">False</property>
<property name="justify">GTK_JUSTIFY_LEFT</property>
@@ -3933,7 +3698,7 @@ You may access the software update tool by running <b>Software Update</
<child>
<widget class="GtkLabel" id="passwordLabel">
<property name="visible">True</property>
- <property name="label" translatable="yes" context="yes">Proxy P_assword:</property>
+ <property name="label" translatable="yes">Proxy P_assword:</property>
<property name="use_underline">True</property>
<property name="use_markup">False</property>
<property name="justify">GTK_JUSTIFY_LEFT</property>
@@ -4067,7 +3832,7 @@ You may access the software update tool by running <b>Software Update</
<child>
<widget class="GtkButton" id="button1">
<property name="visible">True</property>
- <property name="label" translatable="yes" context="yes">_No, Cancel</property>
+ <property name="label" translatable="yes">_No, Cancel</property>
<property name="use_underline">True</property>
<property name="relief">GTK_RELIEF_NORMAL</property>
<property name="focus_on_click">True</property>
@@ -4081,7 +3846,7 @@ You may access the software update tool by running <b>Software Update</
<child>
<widget class="GtkButton" id="button2">
<property name="visible">True</property>
- <property name="label" translatable="yes" context="yes">_Yes, Continue</property>
+ <property name="label" translatable="yes">_Yes, Continue</property>
<property name="use_underline">True</property>
<property name="relief">GTK_RELIEF_NORMAL</property>
<property name="focus_on_click">True</property>
@@ -4252,7 +4017,7 @@ Are you sure you would like to continue?</property>
<child>
<widget class="GtkButton" id="button1">
<property name="visible">True</property>
- <property name="label" translatable="yes" context="yes">_Go Back and Register</property>
+ <property name="label" translatable="yes">_Go Back and Register</property>
<property name="use_underline">True</property>
<property name="relief">GTK_RELIEF_NORMAL</property>
<property name="focus_on_click">True</property>
@@ -4266,7 +4031,7 @@ Are you sure you would like to continue?</property>
<child>
<widget class="GtkButton" id="button2">
<property name="visible">True</property>
- <property name="label" translatable="yes" context="yes">Register _Later</property>
+ <property name="label" translatable="yes">Register _Later</property>
<property name="use_underline">True</property>
<property name="relief">GTK_RELIEF_NORMAL</property>
<property name="focus_on_click">True</property>
@@ -4294,8 +4059,9 @@ Are you sure you would like to continue?</property>
<child>
<widget class="GtkLabel" id="label25">
+ <property name="width_request">600</property>
<property name="visible">True</property>
- <property name="label" translatable="yes" context="yes">Are you sure you don't want to register your system with Red Hat? You'll miss out on the benefits of a Red Hat Enterprise Linux Subscription:</property>
+ <property name="label" translatable="yes">Are you sure you don't want to register your system with Red Hat? You'll miss out on the benefits of a Red Hat Enterprise Linux Subscription:</property>
<property name="use_underline">False</property>
<property name="use_markup">False</property>
<property name="justify">GTK_JUSTIFY_LEFT</property>
@@ -4306,12 +4072,12 @@ Are you sure you would like to continue?</property>
<property name="xpad">0</property>
<property name="ypad">0</property>
<property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
- <property name="width_request">600</property>
+ <property name="width_chars">-1</property>
<property name="single_line_mode">False</property>
<property name="angle">0</property>
- <accessibility>
- <atkproperty name="AtkObject::accessible_name" translatable="yes">Are you sure you don't want to register your system with Red Hat? You'll miss out on the benefits of a Red Hat Enterprise Linux Subscription:</atkproperty>
- </accessibility>
+ <accessibility>
+ <atkproperty name="AtkObject::accessible_name" translatable="yes">Are you sure you don't want to register your system with Red Hat? You'll miss out on the benefits of a Red Hat Enterprise Linux Subscription:</atkproperty>
+ </accessibility>
</widget>
<packing>
<property name="padding">0</property>
@@ -4341,7 +4107,7 @@ Are you sure you would like to continue?</property>
<child>
<widget class="GtkLabel" id="label27">
<property name="visible">True</property>
- <property name="label" translatable="yes" context="yes"><b>Security &amp; Updates:</b></property>
+ <property name="label" translatable="yes"><b>Security &amp; Updates:</b></property>
<property name="use_underline">False</property>
<property name="use_markup">True</property>
<property name="justify">GTK_JUSTIFY_LEFT</property>
@@ -4400,8 +4166,9 @@ Are you sure you would like to continue?</property>
<child>
<widget class="GtkLabel" id="label31">
+ <property name="width_request">460</property>
<property name="visible">True</property>
- <property name="label" translatable="yes" context="yes">Receive the latest software updates, including security updates, keeping this Red Hat Enterprise Linux system <b>updated</b> and <b>secure</b>.</property>
+ <property name="label" translatable="yes">Receive the latest software updates, including security updates, keeping this Red Hat Enterprise Linux system <b>updated</b> and <b>secure</b>.</property>
<property name="use_underline">False</property>
<property name="use_markup">True</property>
<property name="justify">GTK_JUSTIFY_LEFT</property>
@@ -4412,7 +4179,7 @@ Are you sure you would like to continue?</property>
<property name="xpad">0</property>
<property name="ypad">0</property>
<property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
- <property name="width_request">460</property>
+ <property name="width_chars">-1</property>
<property name="single_line_mode">False</property>
<property name="angle">0</property>
</widget>
@@ -4435,7 +4202,7 @@ Are you sure you would like to continue?</property>
<child>
<widget class="GtkLabel" id="label28">
<property name="visible">True</property>
- <property name="label" translatable="yes" context="yes"><b>Downloads &amp; Upgrades:</b></property>
+ <property name="label" translatable="yes"><b>Downloads &amp; Upgrades:</b></property>
<property name="use_underline">False</property>
<property name="use_markup">True</property>
<property name="justify">GTK_JUSTIFY_LEFT</property>
@@ -4494,8 +4261,9 @@ Are you sure you would like to continue?</property>
<child>
<widget class="GtkLabel" id="label33">
+ <property name="width_request">460</property>
<property name="visible">True</property>
- <property name="label" translatable="yes" context="yes">Download installation images for Red Hat Enterprise Linux releases, including new releases.</property>
+ <property name="label" translatable="yes">Download installation images for Red Hat Enterprise Linux releases, including new releases.</property>
<property name="use_underline">False</property>
<property name="use_markup">True</property>
<property name="justify">GTK_JUSTIFY_LEFT</property>
@@ -4506,7 +4274,7 @@ Are you sure you would like to continue?</property>
<property name="xpad">0</property>
<property name="ypad">0</property>
<property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
- <property name="width_request">460</property>
+ <property name="width_chars">-1</property>
<property name="single_line_mode">False</property>
<property name="angle">0</property>
</widget>
@@ -4529,7 +4297,7 @@ Are you sure you would like to continue?</property>
<child>
<widget class="GtkLabel" id="label29">
<property name="visible">True</property>
- <property name="label" translatable="yes" context="yes"><b>Support:</b></property>
+ <property name="label" translatable="yes"><b>Support:</b></property>
<property name="use_underline">False</property>
<property name="use_markup">True</property>
<property name="justify">GTK_JUSTIFY_LEFT</property>
@@ -4588,8 +4356,9 @@ Are you sure you would like to continue?</property>
<child>
<widget class="GtkLabel" id="label41">
+ <property name="width_request">460</property>
<property name="visible">True</property>
- <property name="label" translatable="yes" context="yes">Access to the technical support experts at Red Hat or Red Hat's partners for help with any issues you might encounter with this system.</property>
+ <property name="label" translatable="yes">Access to the technical support experts at Red Hat or Red Hat's partners for help with any issues you might encounter with this system.</property>
<property name="use_underline">False</property>
<property name="use_markup">True</property>
<property name="justify">GTK_JUSTIFY_LEFT</property>
@@ -4600,7 +4369,7 @@ Are you sure you would like to continue?</property>
<property name="xpad">0</property>
<property name="ypad">0</property>
<property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
- <property name="width_request">460</property>
+ <property name="width_chars">-1</property>
<property name="single_line_mode">False</property>
<property name="angle">0</property>
</widget>
@@ -4623,7 +4392,7 @@ Are you sure you would like to continue?</property>
<child>
<widget class="GtkLabel" id="label30">
<property name="visible">True</property>
- <property name="label" translatable="yes" context="yes"><b>Management:</b></property>
+ <property name="label" translatable="yes"><b>Management:</b></property>
<property name="use_underline">False</property>
<property name="use_markup">True</property>
<property name="justify">GTK_JUSTIFY_LEFT</property>
@@ -4637,9 +4406,9 @@ Are you sure you would like to continue?</property>
<property name="width_chars">-1</property>
<property name="single_line_mode">False</property>
<property name="angle">0</property>
- <accessibility>
- <atkproperty name="AtkObject::accessible_name" translatable="yes">Management:</atkproperty>
- </accessibility>
+ <accessibility>
+ <atkproperty name="AtkObject::accessible_name" translatable="yes">Management:</atkproperty>
+ </accessibility>
</widget>
<packing>
<property name="padding">0</property>
@@ -4685,9 +4454,10 @@ Are you sure you would like to continue?</property>
<child>
<widget class="GtkLabel" id="label42">
+ <property name="width_request">460</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="label" translatable="yes" context="yes">Manage subscriptions and systems registered to Customer Portal via access.redhat.com or through one of our other subscription management services.</property>
+ <property name="label" translatable="yes">Manage subscriptions and systems registered to Customer Portal via access.redhat.com or through one of our other subscription management services.</property>
<property name="use_underline">False</property>
<property name="use_markup">True</property>
<property name="justify">GTK_JUSTIFY_LEFT</property>
@@ -4698,12 +4468,12 @@ Are you sure you would like to continue?</property>
<property name="xpad">0</property>
<property name="ypad">0</property>
<property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
- <property name="width_request">460</property>
+ <property name="width_chars">-1</property>
<property name="single_line_mode">False</property>
<property name="angle">0</property>
- <accessibility>
- <atkproperty name="AtkObject::accessible_name" translatable="yes">Manage subscriptions and systems registered to Customer Portal via access.redhat.com or through one of our other subscription management services.</atkproperty>
- </accessibility>
+ <accessibility>
+ <atkproperty name="AtkObject::accessible_name" translatable="yes">Manage subscriptions and systems registered to Customer Portal via access.redhat.com or through one of our other subscription management services.</atkproperty>
+ </accessibility>
</widget>
<packing>
<property name="padding">0</property>
@@ -4733,7 +4503,7 @@ Are you sure you would like to continue?</property>
<child>
<widget class="GtkLabel" id="label26">
<property name="visible">True</property>
- <property name="label" translatable="yes" context="yes">You will not be able to take advantage of these benefits without registering.</property>
+ <property name="label" translatable="yes">You will not be able to take advantage of these benefits without registering.</property>
<property name="use_underline">False</property>
<property name="use_markup">True</property>
<property name="justify">GTK_JUSTIFY_LEFT</property>
@@ -4747,9 +4517,9 @@ Are you sure you would like to continue?</property>
<property name="width_chars">-1</property>
<property name="single_line_mode">False</property>
<property name="angle">0</property>
- <accessibility>
- <atkproperty name="AtkObject::accessible_name" translatable="yes">You will not be able to take advantage of these benefits without registering.</atkproperty>
- </accessibility>
+ <accessibility>
+ <atkproperty name="AtkObject::accessible_name" translatable="yes">You will not be able to take advantage of these benefits without registering.</atkproperty>
+ </accessibility>
</widget>
<packing>
<property name="padding">0</property>
@@ -4798,7 +4568,7 @@ Are you sure you would like to continue?</property>
<child>
<widget class="GtkButton" id="button3">
<property name="visible">True</property>
- <property name="label" translatable="yes" context="yes">_No, Cancel</property>
+ <property name="label" translatable="yes">_No, Cancel</property>
<property name="use_underline">True</property>
<property name="relief">GTK_RELIEF_NORMAL</property>
<property name="focus_on_click">True</property>
@@ -4812,7 +4582,7 @@ Are you sure you would like to continue?</property>
<child>
<widget class="GtkButton" id="button4">
<property name="visible">True</property>
- <property name="label" translatable="yes" context="yes">_Yes, Continue</property>
+ <property name="label" translatable="yes">_Yes, Continue</property>
<property name="use_underline">True</property>
<property name="relief">GTK_RELIEF_NORMAL</property>
<property name="focus_on_click">True</property>
@@ -4841,7 +4611,7 @@ Are you sure you would like to continue?</property>
<child>
<widget class="GtkLabel" id="label44">
<property name="visible">True</property>
- <property name="label" translatable="yes" context="yes">It appears this system has already been set up for software updates:</property>
+ <property name="label" translatable="yes">It appears this system has already been set up for software updates:</property>
<property name="use_underline">False</property>
<property name="use_markup">False</property>
<property name="justify">GTK_JUSTIFY_LEFT</property>
@@ -4875,7 +4645,7 @@ Are you sure you would like to continue?</property>
<child>
<widget class="GtkLabel" id="label52">
<property name="visible">True</property>
- <property name="label" translatable="yes" context="yes"><b>Red Hat Network Location:</b></property>
+ <property name="label" translatable="yes"><b>Red Hat Network Location:</b></property>
<property name="use_underline">False</property>
<property name="use_markup">True</property>
<property name="justify">GTK_JUSTIFY_LEFT</property>
@@ -4903,7 +4673,7 @@ Are you sure you would like to continue?</property>
<child>
<widget class="GtkLabel" id="label53">
<property name="visible">True</property>
- <property name="label" translatable="yes" context="yes"><b>Login:</b></property>
+ <property name="label" translatable="yes"><b>Login:</b></property>
<property name="use_underline">False</property>
<property name="use_markup">True</property>
<property name="justify">GTK_JUSTIFY_LEFT</property>
@@ -4931,7 +4701,7 @@ Are you sure you would like to continue?</property>
<child>
<widget class="GtkLabel" id="label54">
<property name="visible">True</property>
- <property name="label" translatable="yes" context="yes"><b>System ID:</b></property>
+ <property name="label" translatable="yes"><b>System ID:</b></property>
<property name="use_underline">False</property>
<property name="use_markup">True</property>
<property name="justify">GTK_JUSTIFY_LEFT</property>
@@ -4960,7 +4730,7 @@ Are you sure you would like to continue?</property>
<widget class="GtkLabel" id="serverUrlLabel">
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="label" translatable="yes" context="yes">label</property>
+ <property name="label" translatable="yes">label</property>
<property name="use_underline">False</property>
<property name="use_markup">False</property>
<property name="justify">GTK_JUSTIFY_LEFT</property>
@@ -4989,7 +4759,7 @@ Are you sure you would like to continue?</property>
<widget class="GtkLabel" id="usernameLabel">
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="label" translatable="yes" context="yes">label</property>
+ <property name="label" translatable="yes">label</property>
<property name="use_underline">False</property>
<property name="use_markup">False</property>
<property name="justify">GTK_JUSTIFY_LEFT</property>
@@ -5018,7 +4788,7 @@ Are you sure you would like to continue?</property>
<widget class="GtkLabel" id="systemIdLabel">
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="label" translatable="yes" context="yes">label</property>
+ <property name="label" translatable="yes">label</property>
<property name="use_underline">False</property>
<property name="use_markup">False</property>
<property name="justify">GTK_JUSTIFY_LEFT</property>
@@ -5053,7 +4823,7 @@ Are you sure you would like to continue?</property>
<child>
<widget class="GtkLabel" id="label50">
<property name="visible">True</property>
- <property name="label" translatable="yes" context="yes">Are you sure you would like to continue?</property>
+ <property name="label" translatable="yes">Are you sure you would like to continue?</property>
<property name="use_underline">False</property>
<property name="use_markup">False</property>
<property name="justify">GTK_JUSTIFY_LEFT</property>
@@ -5115,7 +4885,7 @@ Are you sure you would like to continue?</property>
<child>
<widget class="GtkButton" id="button5">
<property name="visible">True</property>
- <property name="label" translatable="yes" context="yes">_No, Cancel</property>
+ <property name="label" translatable="yes">_No, Cancel</property>
<property name="use_underline">True</property>
<property name="relief">GTK_RELIEF_NORMAL</property>
<property name="focus_on_click">True</property>
@@ -5129,7 +4899,7 @@ Are you sure you would like to continue?</property>
<child>
<widget class="GtkButton" id="button6">
<property name="visible">True</property>
- <property name="label" translatable="yes" context="yes">_Yes, Continue</property>
+ <property name="label" translatable="yes">_Yes, Continue</property>
<property name="use_underline">True</property>
<property name="relief">GTK_RELIEF_NORMAL</property>
<property name="focus_on_click">True</property>
@@ -5155,10 +4925,10 @@ Are you sure you would like to continue?</property>
<property name="homogeneous">False</property>
<property name="spacing">15</property>
- <child>
+ <child>
<widget class="GtkLabel" id="label71">
<property name="visible">True</property>
- <property name="label" translatable="yes" context="yes"><b>Warning</b></property>
+ <property name="label" translatable="yes"><b>Warning</b></property>
<property name="use_underline">False</property>
<property name="use_markup">True</property>
<property name="justify">GTK_JUSTIFY_LEFT</property>
@@ -5183,7 +4953,7 @@ Are you sure you would like to continue?</property>
<child>
<widget class="GtkLabel" id="label72">
<property name="visible">True</property>
- <property name="label" translatable="yes" context="yes">This system has already been registered with RHN using RHN certificate-based technology.</property>
+ <property name="label" translatable="yes">This system has already been registered with RHN using RHN certificate-based technology.</property>
<property name="use_underline">False</property>
<property name="use_markup">False</property>
<property name="justify">GTK_JUSTIFY_LEFT</property>
@@ -5208,7 +4978,7 @@ Are you sure you would like to continue?</property>
<child>
<widget class="GtkLabel" id="label73">
<property name="visible">True</property>
- <property name="label" translatable="yes" context="yes">The tool you are using is attempting to re-register using RHN Classic technology. Red Hat recommends (except in a few cases) that customers only register with RHN once.</property>
+ <property name="label" translatable="yes">The tool you are using is attempting to re-register using RHN Classic technology. Red Hat recommends (except in a few cases) that customers only register with RHN once.</property>
<property name="use_underline">False</property>
<property name="use_markup">False</property>
<property name="justify">GTK_JUSTIFY_LEFT</property>
@@ -5233,7 +5003,7 @@ Are you sure you would like to continue?</property>
<child>
<widget class="GtkLabel" id="label74">
<property name="visible">True</property>
- <property name="label" translatable="yes" context="yes">To learn more about RHN registration and technologies please consult this Knowledge Base Article: <a href="https://access.redhat.com/kb/docs/DOC-45563">https://access.redhat.com/kb/docs/DOC-45563</a>
+ <property name="label" translatable="yes">To learn more about RHN registration and technologies please consult this Knowledge Base Article: <a href="https://access.redhat.com/kb/docs/DOC-45563">https://a...
</property>
<property name="use_underline">False</property>
<property name="use_markup">True</property>
@@ -5256,11 +5026,10 @@ Are you sure you would like to continue?</property>
</packing>
</child>
-
<child>
<widget class="GtkLabel" id="label75">
<property name="visible">True</property>
- <property name="label" translatable="yes" context="yes">Are you sure you would like to continue?</property>
+ <property name="label" translatable="yes">Are you sure you would like to continue?</property>
<property name="use_underline">False</property>
<property name="use_markup">False</property>
<property name="justify">GTK_JUSTIFY_LEFT</property>
@@ -5339,7 +5108,7 @@ Are you sure you would like to continue?</property>
<child>
<widget class="GtkLabel" id="label32">
<property name="visible">True</property>
- <property name="label" translatable="yes" context="yes">Software update setup has been completed for this system.</property>
+ <property name="label" translatable="yes">Software update setup has been completed for this system.</property>
<property name="use_underline">False</property>
<property name="use_markup">False</property>
<property name="justify">GTK_JUSTIFY_LEFT</property>
@@ -5371,7 +5140,7 @@ Are you sure you would like to continue?</property>
<child>
<widget class="GtkLabel" id="label47">
<property name="visible">True</property>
- <property name="label" translatable="yes" context="yes">Your system is now ready to receive the software updates that will keep it secure and supported.
+ <property name="label" translatable="yes">Your system is now ready to receive the software updates that will keep it secure and supported.
You'll know when software updates are available when a package icon appears in the notification area of your desktop (usually in the upper-right corner, circled below.) Clicking on this icon, when available, will guide you through applying any updates that are available:</property>
<property name="use_underline">False</property>
@@ -5460,9 +5229,9 @@ You'll know when software updates are available when a package icon appears in t
<property name="width_chars">-1</property>
<property name="single_line_mode">False</property>
<property name="angle">0</property>
- <accessibility>
- <atkproperty name="AtkObject::accessible_name" translatable="yes">Select how your system will receive updates:</atkproperty>
- </accessibility>
+ <accessibility>
+ <atkproperty name="AtkObject::accessible_name" translatable="yes">Select how your system will receive updates:</atkproperty>
+ </accessibility>
</widget>
<packing>
<property name="padding">0</property>
@@ -5489,7 +5258,7 @@ You'll know when software updates are available when a package icon appears in t
<property name="inconsistent">False</property>
<property name="draw_indicator">True</property>
<accessibility>
- <atkproperty name="AtkObject::accessible_name" translatable="yes">Limited updates</atkproperty>
+ <atkproperty name="AtkObject::accessible_name" translatable="yes">Limited updates</atkproperty>
</accessibility>
</widget>
<packing>
@@ -5516,9 +5285,9 @@ You'll know when software updates are available when a package icon appears in t
<property name="width_chars">-1</property>
<property name="single_line_mode">False</property>
<property name="angle">0</property>
- <accessibility>
- <atkproperty name="AtkObject::accessible_name" translatable="yes">Limited updates will be provided to this system, maintaining compatibility with the selected minor release software channel:</atkproperty>
- </accessibility>
+ <accessibility>
+ <atkproperty name="AtkObject::accessible_name" translatable="yes">Limited updates will be provided to this system, maintaining compatibility with the selected minor release software channel:</atkproperty>
+ </accessibility>
</widget>
<packing>
<property name="padding">0</property>
@@ -5715,9 +5484,9 @@ You'll know when software updates are available when a package icon appears in t
<property name="width_chars">-1</property>
<property name="single_line_mode">False</property>
<property name="angle">0</property>
- <accessibility>
- <atkproperty name="AtkObject::accessible_name" translatable="yes">All available updates will be provided to this system. If kept updated, this system will always be equivalent to the latest minor release in the main 'Red Hat Enterprise Linux x' software channel.</atkproperty>
- </accessibility>
+ <accessibility>
+ <atkproperty name="AtkObject::accessible_name" translatable="yes">All available updates will be provided to this system. If kept updated, this system will always be equivalent to the latest minor release in the main 'Red Hat Enterprise Linux x' software channel.</atkproperty>
+ </accessibility>
</widget>
<packing>
<property name="padding">0</property>
@@ -5798,9 +5567,9 @@ You'll know when software updates are available when a package icon appears in t
<property name="width_chars">-1</property>
<property name="single_line_mode">False</property>
<property name="angle">0</property>
- <accessibility>
- <atkproperty name="AtkObject::accessible_name" translatable="yes">Warning: Using this option, your system will always be the most recent minor release and cannot be limited to an older release version.</atkproperty>
- </accessibility>
+ <accessibility>
+ <atkproperty name="AtkObject::accessible_name" translatable="yes">Warning: Using this option, your system will always be the most recent minor release and cannot be limited to an older release version.</atkproperty>
+ </accessibility>
</widget>
<packing>
<property name="padding">0</property>
@@ -5827,96 +5596,6 @@ You'll know when software updates are available when a package icon appears in t
</child>
</widget>
-<widget class="GtkWindow" id="moreInfoDialog">
- <property name="visible">True</property>
- <property name="title" translatable="yes">More Info</property>
- <property name="type">GTK_WINDOW_TOPLEVEL</property>
- <property name="window_position">GTK_WIN_POS_CENTER</property>
- <property name="modal">False</property>
- <property name="default_width">100</property>
- <property name="default_height">100</property>
- <property name="resizable">True</property>
- <property name="destroy_with_parent">False</property>
- <property name="decorated">True</property>
- <property name="skip_taskbar_hint">False</property>
- <property name="skip_pager_hint">False</property>
- <property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property>
- <property name="gravity">GDK_GRAVITY_NORTH_WEST</property>
- <property name="focus_on_map">True</property>
- <property name="urgency_hint">False</property>
-
- <child>
- <widget class="GtkVBox" id="vbox33">
- <property name="border_width">20</property>
- <property name="visible">True</property>
- <property name="homogeneous">False</property>
- <property name="spacing">10</property>
-
- <child>
- <widget class="GtkLabel" id="label152">
- <property name="visible">True</property>
- <property name="label" translatable="yes" context="yes">Alternate services include: CloudForms System Engine, Subscription Asset Manager, Red Hat Network (RHN) Satellite, and RHN Proxy.</property>
- <property name="use_underline">False</property>
- <property name="use_markup">False</property>
- <property name="justify">GTK_JUSTIFY_LEFT</property>
- <property name="wrap">True</property>
- <property name="selectable">False</property>
- <property name="xalign">0</property>
- <property name="yalign">0</property>
- <property name="xpad">0</property>
- <property name="ypad">0</property>
- <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
- <property name="width_chars">-1</property>
- <property name="single_line_mode">False</property>
- <property name="angle">0</property>
- </widget>
- <packing>
- <property name="padding">0</property>
- <property name="expand">False</property>
- <property name="fill">False</property>
- </packing>
- </child>
-
- <child>
- <widget class="GtkHBox" id="hbox37">
- <property name="visible">True</property>
- <property name="homogeneous">False</property>
- <property name="spacing">0</property>
-
- <child>
- <placeholder/>
- </child>
-
- <child>
- <widget class="GtkButton" id="closeMoreInfoButton">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="label" translatable="yes" context="yes">_Close</property>
- <property name="use_underline">True</property>
- <property name="relief">GTK_RELIEF_NORMAL</property>
- <property name="focus_on_click">True</property>
- <signal name="clicked" handler="onCloseMoreInfoButtonClicked"/>
- </widget>
- <packing>
- <property name="padding">0</property>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="pack_type">GTK_PACK_END</property>
- </packing>
- </child>
- </widget>
- <packing>
- <property name="padding">0</property>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="pack_type">GTK_PACK_END</property>
- </packing>
- </child>
- </widget>
- </child>
-</widget>
-
-
<widget class="GtkWindow" id="ksRegisteredFirstbootWindow">
<property name="visible">True</property>
<property name="title">Registered during installation</property>
@@ -5998,7 +5677,7 @@ You'll know when software updates are available when a package icon appears in t
<child>
<widget class="GtkLabel" id="label133">
<property name="visible">True</property>
- <property name="label" translatable="yes" context="yes">Your system is ready to receive the software updates that will keep it secure and supported.
+ <property name="label" translatable="yes">Your system is ready to receive the software updates that will keep it secure and supported.
You'll know when software updates are available when a package icon appears in the notification area of your desktop (usually in the upper-right corner, circled below.) Clicking on this icon, when available, will guide you through applying any updates that are available:</property>
<property name="use_underline">False</property>
diff --git a/client/rhel/rhn-client-tools/etc-conf/up2date.config b/client/rhel/rhn-client-tools/etc-conf/up2date.config
index 4e7455c..24fd7d4 100644
--- a/client/rhel/rhn-client-tools/etc-conf/up2date.config
+++ b/client/rhel/rhn-client-tools/etc-conf/up2date.config
@@ -8,7 +8,6 @@ systemIdPath[comment]=Location of system id
systemIdPath=/etc/sysconfig/rhn/systemid
serverURL[comment]=Remote server URL (use FQDN)
-#serverURL=https://xmlrpc.rhn.redhat.com/XMLRPC
serverURL=https://enter.your.server.url.here/XMLRPC
hostedWhitelist[comment]=RHN Hosted URL's
@@ -33,7 +32,7 @@ disallowConfChanges[comment]=Config options that can not be overwritten by a con
disallowConfChanges=noReboot;sslCACert;useNoSSLForPackages;noSSLServerURL;serverURL;disallowConfChanges;
sslCACert[comment]=The CA cert used to verify the ssl server
-sslCACert=/usr/share/rhn/RHNS-CA-CERT
+sslCACert=/usr/share/rhn/RHN-ORG-TRUSTED-SSL-CERT
# Akamai does not support http protocol, therefore setting this option as side effect disable "Location aware" function
useNoSSLForPackages[comment]=Use the noSSLServerURL for package, package list, and header fetching (disable Akamai)
diff --git a/client/rhel/rhn-client-tools/src/Makefile b/client/rhel/rhn-client-tools/src/Makefile
index 2d6434e..ec55eb3 100644
--- a/client/rhel/rhn-client-tools/src/Makefile
+++ b/client/rhel/rhn-client-tools/src/Makefile
@@ -6,7 +6,7 @@ PREFIX ?=
VERSION ?=
# Dirs we need to walk into
-SUBDIRS = up2date_client actions firstboot firstboot-legacy-rhel5 bin
+SUBDIRS = up2date_client actions firstboot-legacy-rhel6 firstboot-legacy-rhel5 bin
# For subdirs, required exports
export PREFIX
diff --git a/client/rhel/rhn-client-tools/src/firstboot-legacy-rhel6/Makefile b/client/rhel/rhn-client-tools/src/firstboot-legacy-rhel6/Makefile
new file mode 100644
index 0000000..6d1aea4
--- /dev/null
+++ b/client/rhel/rhn-client-tools/src/firstboot-legacy-rhel6/Makefile
@@ -0,0 +1,45 @@
+# Makefile for installing man pages for the up2date client
+#
+# $Id$
+
+TOPMODULE = rhn_register
+MODULES = rhn_login_gui \
+ rhn_start_gui rhn_choose_server_gui \
+ rhn_provide_certificate_gui rhn_create_profile_gui \
+ rhn_review_gui rhn_finish_gui rhn_choose_channel
+TOPPYFILE = $(addsuffix .py, $(TOPMODULE))
+PYFILES = $(addsuffix .py, $(MODULES))
+TOPOBJECT = $(TOPPYFILE) $(addsuffix .pyc, $(TOPMODULE))
+OBJECTS = $(PYFILES) $(addsuffix .pyc, $(MODULES))
+
+# Install stuff
+INSTALL = /usr/bin/install -c
+INSTALL_DATA = $(INSTALL) -m 644
+INSTALL_DIR = $(INSTALL) -m 755 --verbose -d
+
+# Install Directories
+SYSTEMFIRSTBOOTDIR = $(PREFIX)/usr/share/firstboot/modules/
+FIRSTBOOTDIR = $(PREFIX)/usr/share/rhn/up2date_client/firstboot/
+
+
+PYCHECKER = /usr/bin/pychecker
+
+all:: $(TOPOBJECT) $(OBJECTS)
+
+# default compile rule:
+%.pyc: %.py
+ python -c "import py_compile; py_compile.compile('$<')"
+
+install: all $(FIRSTBOOTDIR) $(SYSTEMFIRSTBOOTDIR)
+ $(INSTALL_DATA) $(OBJECTS) $(FIRSTBOOTDIR)/
+ $(INSTALL_DATA) $(TOPOBJECT) $(SYSTEMFIRSTBOOTDIR)/
+
+$(SYSTEMFIRSTBOOTDIR) $(FIRSTBOOTDIR) :
+ @$(INSTALL_DIR) $@
+
+clean:
+ @rm -rf *.pyc *~ .*~ *.o
+
+pychecker::
+ @$(PYCHECKER) $(PYFILES) $(TOPPYFILE) || exit 0
+
diff --git a/client/rhel/rhn-client-tools/src/firstboot-legacy-rhel6/rhn_choose_channel.py b/client/rhel/rhn-client-tools/src/firstboot-legacy-rhel6/rhn_choose_channel.py
new file mode 100644
index 0000000..a8fdec6
--- /dev/null
+++ b/client/rhel/rhn-client-tools/src/firstboot-legacy-rhel6/rhn_choose_channel.py
@@ -0,0 +1,70 @@
+# 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; version 2 of the License.
+#
+# 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 = _("Operating System Release Version")
+ 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
diff --git a/client/rhel/rhn-client-tools/src/firstboot-legacy-rhel6/rhn_choose_server_gui.py b/client/rhel/rhn-client-tools/src/firstboot-legacy-rhel6/rhn_choose_server_gui.py
new file mode 100644
index 0000000..bc303e9
--- /dev/null
+++ b/client/rhel/rhn-client-tools/src/firstboot-legacy-rhel6/rhn_choose_server_gui.py
@@ -0,0 +1,94 @@
+# Copyright 2006--2010 Red Hat, Inc.
+#
+# 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; version 2 of the License.
+#
+# 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:
+# Jan Pazdziora jpazdziora at redhat dot com
+# Daniel Benamy <dbenamy(a)redhat.com>
+
+import sys
+sys.path.append("/usr/share/rhn")
+from up2date_client import rhnreg
+from up2date_client import rhnregGui
+from up2date_client import up2dateErrors
+
+import gtk
+from gtk import glade
+
+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 *
+
+class moduleClass(Module):
+ def __init__(self):
+ Module.__init__(self)
+ self.priority = 106.5
+ self.sidebarTitle = _("Choose Service")
+ self.title = _("Choose Service")
+ self.support_sm = False
+ self.rhsmActive = True
+
+ def needsNetwork(self):
+ return True
+
+ def apply(self, interface, testing=False):
+ if testing:
+ return RESULT_SUCCESS
+
+ if self.support_sm \
+ and not self.chooseServerPage.chooseServerXml.get_widget("satelliteButton").get_active():
+ i = 0
+ while not interface.moduleList[i].__module__.startswith('rhsm_'):
+ i += 1
+ interface.moveToPage(pageNum=i)
+ self.rhsmActive = True
+ return RESULT_JUMP
+
+ try:
+ self.rhsmActive = False
+ if self.chooseServerPage.chooseServerPageApply() is False:
+ interface.moveToPage(moduleTitle=_("Red Hat Account"))
+ return RESULT_JUMP
+ else:
+ return RESULT_FAILURE
+ except up2dateErrors.SSLCertificateVerifyFailedError:
+ interface.moveToPage(moduleTitle=_("Provide Certificate"))
+ return RESULT_JUMP
+ # return RESULT_SUCCESS should work just as well since the
+ # certificate page with priority 107 is the next one anyway
+
+ def createScreen(self):
+ self.chooseServerPage = rhnregGui.ChooseServerPage()
+ self.vbox = gtk.VBox(spacing=5)
+ self.vbox.pack_start(self.chooseServerPage.chooseServerPageVbox(), True, True)
+ if sys.modules.has_key('rhsm_login'):
+ self.support_sm = True
+ self.rhsmButton = self.chooseServerPage.chooseServerXml.get_widget("rhsmButton")
+ self.rhsmButton.set_no_show_all(False)
+ self.rhsmButton.show_all()
+
+ def initializeUI(self):
+ self.chooseServerPage.chooseServerPagePrepare()
+ if self.support_sm and self.rhsmActive:
+ self.rhsmButton.set_active(True)
+
+ def shouldAppear(self):
+ if rhnreg.registered():
+ return False
+ return True
+
diff --git a/client/rhel/rhn-client-tools/src/firstboot-legacy-rhel6/rhn_create_profile_gui.py b/client/rhel/rhn-client-tools/src/firstboot-legacy-rhel6/rhn_create_profile_gui.py
new file mode 100644
index 0000000..0bfdc9f
--- /dev/null
+++ b/client/rhel/rhn-client-tools/src/firstboot-legacy-rhel6/rhn_create_profile_gui.py
@@ -0,0 +1,93 @@
+# Copyright 2003--2010 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; version 2 of the License.
+#
+# 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:
+# Jan Pazdziora jpazdziora at redhat dot com
+
+import sys
+sys.path.append("/usr/share/rhn")
+from up2date_client import rhnreg
+from up2date_client import rhnregGui
+from up2date_client import messageWindow
+
+import gtk
+from gtk import glade
+
+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 *
+
+class moduleClass(Module):
+ def __init__(self):
+ Module.__init__(self)
+ self.priority = 108.7
+ self.sidebarTitle = _("Create Profile")
+ self.title = _("Create Profile")
+
+ def needsNetwork(self):
+ return True
+
+ def apply(self, interface, testing=False):
+ if testing:
+ return RESULT_SUCCESS
+
+ ret = self.createProfilePage.createProfilePageVerify()
+ if ret:
+ return RESULT_FAILURE
+
+ ret = self.createProfilePage.createProfilePageApply()
+ if self.createProfilePage.go_to_finish:
+ interface.moveToPage(moduleTitle=_("Finish Updates Setup"))
+ return RESULT_JUMP
+ if ret:
+ return RESULT_FAILURE
+
+ return RESULT_SUCCESS
+
+ def createScreen(self):
+ self.createProfilePage = FirstbootCreateProfilePage()
+ self.vbox = gtk.VBox(spacing=5)
+ self.vbox.pack_start(self.createProfilePage.createProfilePageVbox(), True, True)
+
+ def initializeUI(self):
+ self.createProfilePage.createProfilePagePrepare()
+
+ def shouldAppear(self):
+ if rhnreg.registered():
+ return False
+ return True
+
+class FirstbootCreateProfilePage(rhnregGui.CreateProfilePage):
+ def __init__(self):
+ rhnregGui.CreateProfilePage.__init__(self)
+
+ def createProfilePageApply(self):
+ self.go_to_finish = False
+ return rhnregGui.CreateProfilePage.createProfilePageApply(self)
+
+ def fatalError(self, error, wrap=1):
+ msg = _("There was a communication error with the server:") \
+ + "\n\n" + error + "\n\n" \
+ + _("Would you like to go back and try again?")
+ dlg = messageWindow.YesNoDialog(msg)
+ ret = dlg.getrc()
+ if not ret:
+ self.go_to_finish = True
+
diff --git a/client/rhel/rhn-client-tools/src/firstboot-legacy-rhel6/rhn_finish_gui.py b/client/rhel/rhn-client-tools/src/firstboot-legacy-rhel6/rhn_finish_gui.py
new file mode 100644
index 0000000..c7d2753
--- /dev/null
+++ b/client/rhel/rhn-client-tools/src/firstboot-legacy-rhel6/rhn_finish_gui.py
@@ -0,0 +1,68 @@
+# Copyright 2006--2010 Red Hat, Inc.
+#
+# 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; version 2 of the License.
+#
+# 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:
+# Jan Pazdziora jpazdziora at redhat dot com
+# Daniel Benamy <dbenamy(a)redhat.com>
+
+import sys
+sys.path.append("/usr/share/rhn")
+from up2date_client import rhnreg
+from up2date_client import rhnregGui
+from up2date_client import config
+
+import gtk
+from gtk import glade
+
+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 *
+
+class moduleClass(Module):
+ def __init__(self):
+ Module.__init__(self)
+ self.priority = 109
+ self.sidebarTitle = _("Finish Updates Setup")
+ self.title = _("Finish Updates Setup")
+
+ def needsNetwork(self):
+ return False
+
+ def apply(self, interface, testing=False):
+ if testing:
+ return RESULT_SUCCESS
+
+ up2DateConfig = config.initUp2dateConfig()
+ up2DateConfig.save()
+ interface.moveToPage(pageNum = len(interface.moduleList))
+ return RESULT_JUMP
+
+ def createScreen(self):
+ self.finishPage = rhnregGui.FinishPage()
+ self.vbox = gtk.VBox(spacing=5)
+ self.vbox.pack_start(self.finishPage.finishPageVbox(), True, True)
+
+ def initializeUI(self):
+ self.finishPage.finishPagePrepare()
+
+ def shouldAppear(self):
+ if rhnreg.registered():
+ return False
+ return True
+
diff --git a/client/rhel/rhn-client-tools/src/firstboot-legacy-rhel6/rhn_login_gui.py b/client/rhel/rhn-client-tools/src/firstboot-legacy-rhel6/rhn_login_gui.py
new file mode 100644
index 0000000..145224f
--- /dev/null
+++ b/client/rhel/rhn-client-tools/src/firstboot-legacy-rhel6/rhn_login_gui.py
@@ -0,0 +1,118 @@
+# Copyright 2006--2010 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; version 2 of the License.
+#
+# 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:
+# Jan Pazdziora jpazdziora at redhat dot com
+
+import sys
+sys.path.append("/usr/share/rhn")
+from up2date_client import rhnreg
+from up2date_client import rhnregGui, rhnserver
+from up2date_client import messageWindow
+
+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 *
+
+class moduleClass(Module):
+ def __init__(self):
+ Module.__init__(self)
+ self.priority = 108.5
+ self.sidebarTitle = _("Red Hat Account")
+ self.title = _("Red Hat Account")
+
+ def needsNetwork(self):
+ return True
+
+ def apply(self, interface, testing=False):
+ if testing:
+ return RESULT_SUCCESS
+
+ if self.loginPage.loginPageVerify():
+ return RESULT_FAILURE
+
+ ret = self.loginPage.loginPageApply()
+ if self.loginPage.go_to_finish:
+ interface.moveToPage(moduleTitle=_("Finish Updates Setup"))
+ return RESULT_JUMP
+ if ret:
+ return RESULT_FAILURE
+
+ # We should try to activate hardware, even if no EUS in firstboot
+ rhnregGui.try_to_activate_hardware()
+
+ # populate capability - needef for EUSsupported
+ s = rhnserver.RhnServer()
+ s.capabilities.validate()
+
+ if rhnregGui.ChooseChannelPage().chooseChannelShouldBeShown():
+ return RESULT_SUCCESS
+ else:
+ interface.moveToPage(moduleTitle=_("Create Profile"))
+ return RESULT_JUMP
+
+ def createScreen(self):
+ self.loginPage = FirstbootLoginPage()
+ self.vbox = gtk.VBox(spacing=5)
+ self.vbox.pack_start(self.loginPage.loginPageVbox(), True, True)
+
+ def initializeUI(self):
+ self.loginPage.loginPagePrepare()
+
+ def shouldAppear(self):
+ if rhnreg.registered():
+ return False
+ return True
+
+ def focus(self):
+ self.loginPage.loginXml.get_widget("loginUserEntry").grab_focus()
+
+class FirstbootLoginPage(rhnregGui.LoginPage):
+ def __init__(self):
+ rhnregGui.LoginPage.__init__(self)
+
+ def loginPageApply(self):
+ self.go_to_finish = False
+ return rhnregGui.LoginPage.loginPageApply(self)
+
+ def fatalError(self, error, wrap=1):
+ msg = _("There was a communication error with the server:") \
+ + "\n\n" + error + "\n\n" \
+ + _("Would you like to go back and try again?")
+ dlg = messageWindow.YesNoDialog(msg)
+ ret = dlg.getrc()
+ if not ret:
+ self.go_to_finish = True
+
+ def goToPageAfterLogin(self):
+ pass
+
+# FIXME: the Enter advancing is not working.
+#
+# def goToPageAfterLogin(self):
+# # This is a hack. More info above.
+# self.goingNextFromNewAccountDialog = True
+# self.parent.nextClicked()
+#
+# def onLoginPageNext(self, dummy=None, dummy2=None):
+# # This is a hackish way to support enter advancing
+# self.parent.nextClicked()
diff --git a/client/rhel/rhn-client-tools/src/firstboot-legacy-rhel6/rhn_provide_certificate_gui.py b/client/rhel/rhn-client-tools/src/firstboot-legacy-rhel6/rhn_provide_certificate_gui.py
new file mode 100644
index 0000000..7d15316
--- /dev/null
+++ b/client/rhel/rhn-client-tools/src/firstboot-legacy-rhel6/rhn_provide_certificate_gui.py
@@ -0,0 +1,74 @@
+# Copyright 2006--2010 Red Hat, Inc.
+#
+# 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; version 2 of the License.
+#
+# 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:
+# Jan Pazdziora jpazdziora at redhat dot com
+# Daniel Benamy <dbenamy(a)redhat.com>
+
+import sys
+sys.path.append("/usr/share/rhn")
+from up2date_client import rhnreg
+from up2date_client import rhnregGui
+
+import gtk
+from gtk import glade
+
+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 *
+
+class moduleClass(Module):
+ def __init__(self):
+ Module.__init__(self)
+ self.priority = 107.5
+ self.sidebarTitle = _("Provide Certificate")
+ self.title = _("Provide Certificate")
+
+ def needsNetwork(self):
+ return True
+
+ def apply(self, interface, testing=False):
+ if testing:
+ return RESULT_SUCCESS
+
+ status = self.provideCertificatePage.provideCertificatePageApply()
+ if status == 0: # cert was installed
+ return RESULT_SUCCESS
+ elif status == 1: # the user doesn't want to provide a cert right now
+ # TODO write a message to disk like the other cases? need to decide
+ # how we want to do error handling in general.
+ interface.moveToPage(moduleTitle=_("Finish Updates Setup"))
+ return RESULT_JUMP
+ else: # an error occurred and the user was notified
+ assert status == 2
+ return RESULT_FAILURE
+
+ def createScreen(self):
+ self.provideCertificatePage = rhnregGui.ProvideCertificatePage()
+ self.vbox = gtk.VBox(spacing=5)
+ self.vbox.pack_start(self.provideCertificatePage.provideCertificatePageVbox(), True, True)
+
+ def initializeUI(self):
+ self.provideCertificatePage.setUrlInWidget()
+
+ def shouldAppear(self):
+ if rhnreg.registered():
+ return False
+ return True
+
diff --git a/client/rhel/rhn-client-tools/src/firstboot-legacy-rhel6/rhn_register.py b/client/rhel/rhn-client-tools/src/firstboot-legacy-rhel6/rhn_register.py
new file mode 100644
index 0000000..6d1081e
--- /dev/null
+++ b/client/rhel/rhn-client-tools/src/firstboot-legacy-rhel6/rhn_register.py
@@ -0,0 +1,31 @@
+# Copyright 2010 Red Hat, Inc.
+#
+# 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; version 2 of the License.
+#
+# 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:
+# Jan Pazdziora jpazdziora at redhat dot com
+
+from firstboot.moduleset import *
+
+import gettext
+_ = lambda x: gettext.ldgettext("rhn-client-tools", x)
+
+class moduleClass(ModuleSet):
+ def __init__(self):
+ ModuleSet.__init__(self)
+ self.priority = 3
+ self.sidebarTitle = _("Set Up Software Updates")
+ self.title = _("Set Up Software Updates")
+ self.path = "/usr/share/rhn/up2date_client/firstboot"
+
diff --git a/client/rhel/rhn-client-tools/src/firstboot-legacy-rhel6/rhn_review_gui.py b/client/rhel/rhn-client-tools/src/firstboot-legacy-rhel6/rhn_review_gui.py
new file mode 100644
index 0000000..ced8655
--- /dev/null
+++ b/client/rhel/rhn-client-tools/src/firstboot-legacy-rhel6/rhn_review_gui.py
@@ -0,0 +1,67 @@
+# Copyright 2006--2010 Red Hat, Inc.
+#
+# 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; version 2 of the License.
+#
+# 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:
+# Jan Pazdziora jpazdziora at redhat dot com
+# Daniel Benamy <dbenamy(a)redhat.com>
+
+import sys
+sys.path.append("/usr/share/rhn")
+from up2date_client import rhnreg
+from up2date_client import rhnregGui
+
+import gtk
+from gtk import glade
+
+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 *
+from firstboot.config import config
+
+class moduleClass(Module):
+ def __init__(self):
+ Module.__init__(self)
+ self.priority = 108.9
+ self.sidebarTitle = _("Review Subscription")
+ self.title = _("Review Subscription")
+
+ def needsNetwork(self):
+ return True
+
+ def apply(self, interface, testing=False):
+ if testing:
+ return RESULT_SUCCESS
+
+ return RESULT_SUCCESS
+
+ def createScreen(self):
+ self.reviewSubscriptionPage = rhnregGui.ReviewSubscriptionPage()
+ self.vbox = gtk.VBox(spacing=5)
+ self.vbox.pack_start(self.reviewSubscriptionPage.reviewSubscriptionPageVbox(), True, True)
+
+ def initializeUI(self):
+ self.reviewSubscriptionPage.reviewSubscriptionPagePrepare()
+ while len(config.interface._control.history) > 1:
+ config.interface._control.history.pop()
+
+ def shouldAppear(self):
+ if rhnreg.registered():
+ return False
+ return True
+
diff --git a/client/rhel/rhn-client-tools/src/firstboot-legacy-rhel6/rhn_start_gui.py b/client/rhel/rhn-client-tools/src/firstboot-legacy-rhel6/rhn_start_gui.py
new file mode 100644
index 0000000..3f883a0
--- /dev/null
+++ b/client/rhel/rhn-client-tools/src/firstboot-legacy-rhel6/rhn_start_gui.py
@@ -0,0 +1,138 @@
+# Copyright 2006--2010 Red Hat, Inc.
+#
+# 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; version 2 of the License.
+#
+# 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:
+# Jan Pazdziora jpazdziora at redhat dot com
+# Daniel Benamy <dbenamy(a)redhat.com>
+
+import sys
+sys.path.append("/usr/share/rhn")
+from up2date_client import rhnreg
+from up2date_client import rhnregGui
+
+import gtk
+from gtk import glade
+
+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 *
+
+from firstboot.loader import _haveNetwork
+
+class moduleClass(Module):
+ def __init__(self):
+ Module.__init__(self)
+ self.priority = 106
+ self.sidebarTitle = _("Set Up Software Updates")
+ self.title = _("Set Up Software Updates")
+ self.skip_registration = False
+ self.start_page_vbox = None
+
+ def apply(self, interface, testing=False):
+ if testing:
+ return RESULT_SUCCESS
+
+ if self.skip_registration:
+ interface.moveToPage(pageNum = len(interface.moduleList))
+ return RESULT_JUMP
+
+ if not self.start_page.startPageRegisterNow():
+ dlg = rhnregGui.ConfirmQuitDialog()
+ if dlg.rc == 0:
+ return RESULT_FAILURE
+ else:
+ interface.moveToPage(moduleTitle=_("Finish Updates Setup"))
+ return RESULT_JUMP
+ return RESULT_SUCCESS
+
+ def createScreen(self):
+ self.vbox = gtk.VBox(spacing=5)
+
+ def initializeUI(self):
+ if self.start_page_vbox:
+ self.start_page_vbox.destroy()
+
+ self.start_page_vbox = self._getVbox()
+ self.vbox.pack_start(self.start_page_vbox, True, True)
+
+ def _system_is_registered(self):
+ if rhnreg.registered():
+ return True
+ try:
+ _rhsm_path = "/usr/share/rhsm/subscription_manager"
+ _rhsm_path_added = False
+ if _rhsm_path not in sys.path:
+ sys.path.append(_rhsm_path)
+ _rhsm_path_added = True
+ import certlib
+ if _rhsm_path_added:
+ sys.path.remove(_rhsm_path)
+ return certlib.ConsumerIdentity.existsAndValid()
+ except:
+ return False
+
+ def _getVbox(self):
+ if self._system_is_registered():
+ self.start_page = KsRegisteredPage()
+ self.skip_registration = True
+ return self.start_page.startPageVbox()
+ if _haveNetwork():
+ self.start_page = rhnregGui.StartPage(firstboot=True)
+ else:
+ self.start_page = NoNetworkPage()
+ self.skip_registration = True
+ return self.start_page.startPageVbox()
+
+class KsRegisteredPage:
+
+ def __init__(self):
+ gladefile = "/usr/share/rhn/up2date_client/rh_register.glade"
+ ksRegisteredXml = gtk.glade.XML(gladefile, "ksRegisteredFirstbootVbox",
+ domain="rhn-client-tools")
+ self.vbox = ksRegisteredXml.get_widget('ksRegisteredFirstbootVbox')
+
+ def startPageVbox(self):
+ return self.vbox
+
+ def startPageRegisterNow(self):
+ return True
+
+
+class NoNetworkPage:
+
+ def __init__(self):
+ gladefile = "/usr/share/rhn/up2date_client/rh_register.glade"
+ noNetworkXml = gtk.glade.XML(gladefile, "noNetworkFirstbootVbox",
+ domain="rhn-client-tools")
+ self.vbox = noNetworkXml.get_widget('noNetworkFirstbootVbox')
+ noNetworkXml.signal_autoconnect({
+ "on_whyRegisterButton_clicked" : self.why_register_button_clicked,
+ })
+
+ def startPageVbox(self):
+ return self.vbox
+
+ def startPageRegisterNow(self):
+ # Sure, we'll register now. heh heh heh
+ # Just continue on past the rhn stuff.
+ return True
+
+ def why_register_button_clicked(self, button):
+ rhnregGui.WhyRegisterDialog()
+
diff --git a/client/rhel/rhn-client-tools/src/firstboot/Makefile b/client/rhel/rhn-client-tools/src/firstboot/Makefile
deleted file mode 100644
index 6d1aea4..0000000
--- a/client/rhel/rhn-client-tools/src/firstboot/Makefile
+++ /dev/null
@@ -1,45 +0,0 @@
-# Makefile for installing man pages for the up2date client
-#
-# $Id$
-
-TOPMODULE = rhn_register
-MODULES = rhn_login_gui \
- rhn_start_gui rhn_choose_server_gui \
- rhn_provide_certificate_gui rhn_create_profile_gui \
- rhn_review_gui rhn_finish_gui rhn_choose_channel
-TOPPYFILE = $(addsuffix .py, $(TOPMODULE))
-PYFILES = $(addsuffix .py, $(MODULES))
-TOPOBJECT = $(TOPPYFILE) $(addsuffix .pyc, $(TOPMODULE))
-OBJECTS = $(PYFILES) $(addsuffix .pyc, $(MODULES))
-
-# Install stuff
-INSTALL = /usr/bin/install -c
-INSTALL_DATA = $(INSTALL) -m 644
-INSTALL_DIR = $(INSTALL) -m 755 --verbose -d
-
-# Install Directories
-SYSTEMFIRSTBOOTDIR = $(PREFIX)/usr/share/firstboot/modules/
-FIRSTBOOTDIR = $(PREFIX)/usr/share/rhn/up2date_client/firstboot/
-
-
-PYCHECKER = /usr/bin/pychecker
-
-all:: $(TOPOBJECT) $(OBJECTS)
-
-# default compile rule:
-%.pyc: %.py
- python -c "import py_compile; py_compile.compile('$<')"
-
-install: all $(FIRSTBOOTDIR) $(SYSTEMFIRSTBOOTDIR)
- $(INSTALL_DATA) $(OBJECTS) $(FIRSTBOOTDIR)/
- $(INSTALL_DATA) $(TOPOBJECT) $(SYSTEMFIRSTBOOTDIR)/
-
-$(SYSTEMFIRSTBOOTDIR) $(FIRSTBOOTDIR) :
- @$(INSTALL_DIR) $@
-
-clean:
- @rm -rf *.pyc *~ .*~ *.o
-
-pychecker::
- @$(PYCHECKER) $(PYFILES) $(TOPPYFILE) || exit 0
-
diff --git a/client/rhel/rhn-client-tools/src/firstboot/rhn_choose_channel.py b/client/rhel/rhn-client-tools/src/firstboot/rhn_choose_channel.py
deleted file mode 100644
index a8fdec6..0000000
--- a/client/rhel/rhn-client-tools/src/firstboot/rhn_choose_channel.py
+++ /dev/null
@@ -1,70 +0,0 @@
-# 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; version 2 of the License.
-#
-# 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 = _("Operating System Release Version")
- 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
diff --git a/client/rhel/rhn-client-tools/src/firstboot/rhn_choose_server_gui.py b/client/rhel/rhn-client-tools/src/firstboot/rhn_choose_server_gui.py
deleted file mode 100644
index 517965a..0000000
--- a/client/rhel/rhn-client-tools/src/firstboot/rhn_choose_server_gui.py
+++ /dev/null
@@ -1,95 +0,0 @@
-# Copyright 2006--2010 Red Hat, Inc.
-#
-# 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; version 2 of the License.
-#
-# 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:
-# Jan Pazdziora jpazdziora at redhat dot com
-# Daniel Benamy <dbenamy(a)redhat.com>
-
-import sys
-sys.path.append("/usr/share/rhn")
-from up2date_client import rhnreg
-from up2date_client import rhnregGui
-from up2date_client import up2dateErrors
-
-import gtk
-from gtk import glade
-
-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 *
-
-class moduleClass(Module):
- def __init__(self):
- Module.__init__(self)
- self.priority = 106.5
- self.sidebarTitle = _("Choose Service")
- self.title = _("Choose Service")
- self.support_sm = False
- self.rhsmActive = True
-
- def needsNetwork(self):
- return True
-
- def apply(self, interface, testing=False):
- if testing:
- return RESULT_SUCCESS
-
- if self.support_sm \
- and not self.chooseServerPage.chooseServerXml.get_widget("hostedButton").get_active() \
- and not self.chooseServerPage.chooseServerXml.get_widget("satelliteButton").get_active():
- i = 0
- while not interface.moduleList[i].__module__.startswith('rhsm_'):
- i += 1
- interface.moveToPage(pageNum=i)
- self.rhsmActive = True
- return RESULT_JUMP
-
- try:
- self.rhsmActive = False
- if self.chooseServerPage.chooseServerPageApply() is False:
- interface.moveToPage(moduleTitle=_("Red Hat Account"))
- return RESULT_JUMP
- else:
- return RESULT_FAILURE
- except up2dateErrors.SSLCertificateVerifyFailedError:
- interface.moveToPage(moduleTitle=_("Provide Certificate"))
- return RESULT_JUMP
- # return RESULT_SUCCESS should work just as well since the
- # certificate page with priority 107 is the next one anyway
-
- def createScreen(self):
- self.chooseServerPage = rhnregGui.ChooseServerPage()
- self.vbox = gtk.VBox(spacing=5)
- self.vbox.pack_start(self.chooseServerPage.chooseServerPageVbox(), True, True)
- if sys.modules.has_key('rhsm_login'):
- self.support_sm = True
- self.rhsmButton = self.chooseServerPage.chooseServerXml.get_widget("rhsmButton")
- self.rhsmButton.set_no_show_all(False)
- self.rhsmButton.show_all()
-
- def initializeUI(self):
- self.chooseServerPage.chooseServerPagePrepare()
- if self.support_sm and self.rhsmActive:
- self.rhsmButton.set_active(True)
-
- def shouldAppear(self):
- if rhnreg.registered():
- return False
- return True
-
diff --git a/client/rhel/rhn-client-tools/src/firstboot/rhn_create_profile_gui.py b/client/rhel/rhn-client-tools/src/firstboot/rhn_create_profile_gui.py
deleted file mode 100644
index 0bfdc9f..0000000
--- a/client/rhel/rhn-client-tools/src/firstboot/rhn_create_profile_gui.py
+++ /dev/null
@@ -1,93 +0,0 @@
-# Copyright 2003--2010 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; version 2 of the License.
-#
-# 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:
-# Jan Pazdziora jpazdziora at redhat dot com
-
-import sys
-sys.path.append("/usr/share/rhn")
-from up2date_client import rhnreg
-from up2date_client import rhnregGui
-from up2date_client import messageWindow
-
-import gtk
-from gtk import glade
-
-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 *
-
-class moduleClass(Module):
- def __init__(self):
- Module.__init__(self)
- self.priority = 108.7
- self.sidebarTitle = _("Create Profile")
- self.title = _("Create Profile")
-
- def needsNetwork(self):
- return True
-
- def apply(self, interface, testing=False):
- if testing:
- return RESULT_SUCCESS
-
- ret = self.createProfilePage.createProfilePageVerify()
- if ret:
- return RESULT_FAILURE
-
- ret = self.createProfilePage.createProfilePageApply()
- if self.createProfilePage.go_to_finish:
- interface.moveToPage(moduleTitle=_("Finish Updates Setup"))
- return RESULT_JUMP
- if ret:
- return RESULT_FAILURE
-
- return RESULT_SUCCESS
-
- def createScreen(self):
- self.createProfilePage = FirstbootCreateProfilePage()
- self.vbox = gtk.VBox(spacing=5)
- self.vbox.pack_start(self.createProfilePage.createProfilePageVbox(), True, True)
-
- def initializeUI(self):
- self.createProfilePage.createProfilePagePrepare()
-
- def shouldAppear(self):
- if rhnreg.registered():
- return False
- return True
-
-class FirstbootCreateProfilePage(rhnregGui.CreateProfilePage):
- def __init__(self):
- rhnregGui.CreateProfilePage.__init__(self)
-
- def createProfilePageApply(self):
- self.go_to_finish = False
- return rhnregGui.CreateProfilePage.createProfilePageApply(self)
-
- def fatalError(self, error, wrap=1):
- msg = _("There was a communication error with the server:") \
- + "\n\n" + error + "\n\n" \
- + _("Would you like to go back and try again?")
- dlg = messageWindow.YesNoDialog(msg)
- ret = dlg.getrc()
- if not ret:
- self.go_to_finish = True
-
diff --git a/client/rhel/rhn-client-tools/src/firstboot/rhn_finish_gui.py b/client/rhel/rhn-client-tools/src/firstboot/rhn_finish_gui.py
deleted file mode 100644
index c7d2753..0000000
--- a/client/rhel/rhn-client-tools/src/firstboot/rhn_finish_gui.py
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 2006--2010 Red Hat, Inc.
-#
-# 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; version 2 of the License.
-#
-# 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:
-# Jan Pazdziora jpazdziora at redhat dot com
-# Daniel Benamy <dbenamy(a)redhat.com>
-
-import sys
-sys.path.append("/usr/share/rhn")
-from up2date_client import rhnreg
-from up2date_client import rhnregGui
-from up2date_client import config
-
-import gtk
-from gtk import glade
-
-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 *
-
-class moduleClass(Module):
- def __init__(self):
- Module.__init__(self)
- self.priority = 109
- self.sidebarTitle = _("Finish Updates Setup")
- self.title = _("Finish Updates Setup")
-
- def needsNetwork(self):
- return False
-
- def apply(self, interface, testing=False):
- if testing:
- return RESULT_SUCCESS
-
- up2DateConfig = config.initUp2dateConfig()
- up2DateConfig.save()
- interface.moveToPage(pageNum = len(interface.moduleList))
- return RESULT_JUMP
-
- def createScreen(self):
- self.finishPage = rhnregGui.FinishPage()
- self.vbox = gtk.VBox(spacing=5)
- self.vbox.pack_start(self.finishPage.finishPageVbox(), True, True)
-
- def initializeUI(self):
- self.finishPage.finishPagePrepare()
-
- def shouldAppear(self):
- if rhnreg.registered():
- return False
- return True
-
diff --git a/client/rhel/rhn-client-tools/src/firstboot/rhn_login_gui.py b/client/rhel/rhn-client-tools/src/firstboot/rhn_login_gui.py
deleted file mode 100644
index 145224f..0000000
--- a/client/rhel/rhn-client-tools/src/firstboot/rhn_login_gui.py
+++ /dev/null
@@ -1,118 +0,0 @@
-# Copyright 2006--2010 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; version 2 of the License.
-#
-# 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:
-# Jan Pazdziora jpazdziora at redhat dot com
-
-import sys
-sys.path.append("/usr/share/rhn")
-from up2date_client import rhnreg
-from up2date_client import rhnregGui, rhnserver
-from up2date_client import messageWindow
-
-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 *
-
-class moduleClass(Module):
- def __init__(self):
- Module.__init__(self)
- self.priority = 108.5
- self.sidebarTitle = _("Red Hat Account")
- self.title = _("Red Hat Account")
-
- def needsNetwork(self):
- return True
-
- def apply(self, interface, testing=False):
- if testing:
- return RESULT_SUCCESS
-
- if self.loginPage.loginPageVerify():
- return RESULT_FAILURE
-
- ret = self.loginPage.loginPageApply()
- if self.loginPage.go_to_finish:
- interface.moveToPage(moduleTitle=_("Finish Updates Setup"))
- return RESULT_JUMP
- if ret:
- return RESULT_FAILURE
-
- # We should try to activate hardware, even if no EUS in firstboot
- rhnregGui.try_to_activate_hardware()
-
- # populate capability - needef for EUSsupported
- s = rhnserver.RhnServer()
- s.capabilities.validate()
-
- if rhnregGui.ChooseChannelPage().chooseChannelShouldBeShown():
- return RESULT_SUCCESS
- else:
- interface.moveToPage(moduleTitle=_("Create Profile"))
- return RESULT_JUMP
-
- def createScreen(self):
- self.loginPage = FirstbootLoginPage()
- self.vbox = gtk.VBox(spacing=5)
- self.vbox.pack_start(self.loginPage.loginPageVbox(), True, True)
-
- def initializeUI(self):
- self.loginPage.loginPagePrepare()
-
- def shouldAppear(self):
- if rhnreg.registered():
- return False
- return True
-
- def focus(self):
- self.loginPage.loginXml.get_widget("loginUserEntry").grab_focus()
-
-class FirstbootLoginPage(rhnregGui.LoginPage):
- def __init__(self):
- rhnregGui.LoginPage.__init__(self)
-
- def loginPageApply(self):
- self.go_to_finish = False
- return rhnregGui.LoginPage.loginPageApply(self)
-
- def fatalError(self, error, wrap=1):
- msg = _("There was a communication error with the server:") \
- + "\n\n" + error + "\n\n" \
- + _("Would you like to go back and try again?")
- dlg = messageWindow.YesNoDialog(msg)
- ret = dlg.getrc()
- if not ret:
- self.go_to_finish = True
-
- def goToPageAfterLogin(self):
- pass
-
-# FIXME: the Enter advancing is not working.
-#
-# def goToPageAfterLogin(self):
-# # This is a hack. More info above.
-# self.goingNextFromNewAccountDialog = True
-# self.parent.nextClicked()
-#
-# def onLoginPageNext(self, dummy=None, dummy2=None):
-# # This is a hackish way to support enter advancing
-# self.parent.nextClicked()
diff --git a/client/rhel/rhn-client-tools/src/firstboot/rhn_provide_certificate_gui.py b/client/rhel/rhn-client-tools/src/firstboot/rhn_provide_certificate_gui.py
deleted file mode 100644
index 7d15316..0000000
--- a/client/rhel/rhn-client-tools/src/firstboot/rhn_provide_certificate_gui.py
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 2006--2010 Red Hat, Inc.
-#
-# 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; version 2 of the License.
-#
-# 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:
-# Jan Pazdziora jpazdziora at redhat dot com
-# Daniel Benamy <dbenamy(a)redhat.com>
-
-import sys
-sys.path.append("/usr/share/rhn")
-from up2date_client import rhnreg
-from up2date_client import rhnregGui
-
-import gtk
-from gtk import glade
-
-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 *
-
-class moduleClass(Module):
- def __init__(self):
- Module.__init__(self)
- self.priority = 107.5
- self.sidebarTitle = _("Provide Certificate")
- self.title = _("Provide Certificate")
-
- def needsNetwork(self):
- return True
-
- def apply(self, interface, testing=False):
- if testing:
- return RESULT_SUCCESS
-
- status = self.provideCertificatePage.provideCertificatePageApply()
- if status == 0: # cert was installed
- return RESULT_SUCCESS
- elif status == 1: # the user doesn't want to provide a cert right now
- # TODO write a message to disk like the other cases? need to decide
- # how we want to do error handling in general.
- interface.moveToPage(moduleTitle=_("Finish Updates Setup"))
- return RESULT_JUMP
- else: # an error occurred and the user was notified
- assert status == 2
- return RESULT_FAILURE
-
- def createScreen(self):
- self.provideCertificatePage = rhnregGui.ProvideCertificatePage()
- self.vbox = gtk.VBox(spacing=5)
- self.vbox.pack_start(self.provideCertificatePage.provideCertificatePageVbox(), True, True)
-
- def initializeUI(self):
- self.provideCertificatePage.setUrlInWidget()
-
- def shouldAppear(self):
- if rhnreg.registered():
- return False
- return True
-
diff --git a/client/rhel/rhn-client-tools/src/firstboot/rhn_register.py b/client/rhel/rhn-client-tools/src/firstboot/rhn_register.py
deleted file mode 100644
index 6d1081e..0000000
--- a/client/rhel/rhn-client-tools/src/firstboot/rhn_register.py
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 2010 Red Hat, Inc.
-#
-# 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; version 2 of the License.
-#
-# 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:
-# Jan Pazdziora jpazdziora at redhat dot com
-
-from firstboot.moduleset import *
-
-import gettext
-_ = lambda x: gettext.ldgettext("rhn-client-tools", x)
-
-class moduleClass(ModuleSet):
- def __init__(self):
- ModuleSet.__init__(self)
- self.priority = 3
- self.sidebarTitle = _("Set Up Software Updates")
- self.title = _("Set Up Software Updates")
- self.path = "/usr/share/rhn/up2date_client/firstboot"
-
diff --git a/client/rhel/rhn-client-tools/src/firstboot/rhn_review_gui.py b/client/rhel/rhn-client-tools/src/firstboot/rhn_review_gui.py
deleted file mode 100644
index ced8655..0000000
--- a/client/rhel/rhn-client-tools/src/firstboot/rhn_review_gui.py
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 2006--2010 Red Hat, Inc.
-#
-# 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; version 2 of the License.
-#
-# 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:
-# Jan Pazdziora jpazdziora at redhat dot com
-# Daniel Benamy <dbenamy(a)redhat.com>
-
-import sys
-sys.path.append("/usr/share/rhn")
-from up2date_client import rhnreg
-from up2date_client import rhnregGui
-
-import gtk
-from gtk import glade
-
-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 *
-from firstboot.config import config
-
-class moduleClass(Module):
- def __init__(self):
- Module.__init__(self)
- self.priority = 108.9
- self.sidebarTitle = _("Review Subscription")
- self.title = _("Review Subscription")
-
- def needsNetwork(self):
- return True
-
- def apply(self, interface, testing=False):
- if testing:
- return RESULT_SUCCESS
-
- return RESULT_SUCCESS
-
- def createScreen(self):
- self.reviewSubscriptionPage = rhnregGui.ReviewSubscriptionPage()
- self.vbox = gtk.VBox(spacing=5)
- self.vbox.pack_start(self.reviewSubscriptionPage.reviewSubscriptionPageVbox(), True, True)
-
- def initializeUI(self):
- self.reviewSubscriptionPage.reviewSubscriptionPagePrepare()
- while len(config.interface._control.history) > 1:
- config.interface._control.history.pop()
-
- def shouldAppear(self):
- if rhnreg.registered():
- return False
- return True
-
diff --git a/client/rhel/rhn-client-tools/src/firstboot/rhn_start_gui.py b/client/rhel/rhn-client-tools/src/firstboot/rhn_start_gui.py
deleted file mode 100644
index 3f883a0..0000000
--- a/client/rhel/rhn-client-tools/src/firstboot/rhn_start_gui.py
+++ /dev/null
@@ -1,138 +0,0 @@
-# Copyright 2006--2010 Red Hat, Inc.
-#
-# 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; version 2 of the License.
-#
-# 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:
-# Jan Pazdziora jpazdziora at redhat dot com
-# Daniel Benamy <dbenamy(a)redhat.com>
-
-import sys
-sys.path.append("/usr/share/rhn")
-from up2date_client import rhnreg
-from up2date_client import rhnregGui
-
-import gtk
-from gtk import glade
-
-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 *
-
-from firstboot.loader import _haveNetwork
-
-class moduleClass(Module):
- def __init__(self):
- Module.__init__(self)
- self.priority = 106
- self.sidebarTitle = _("Set Up Software Updates")
- self.title = _("Set Up Software Updates")
- self.skip_registration = False
- self.start_page_vbox = None
-
- def apply(self, interface, testing=False):
- if testing:
- return RESULT_SUCCESS
-
- if self.skip_registration:
- interface.moveToPage(pageNum = len(interface.moduleList))
- return RESULT_JUMP
-
- if not self.start_page.startPageRegisterNow():
- dlg = rhnregGui.ConfirmQuitDialog()
- if dlg.rc == 0:
- return RESULT_FAILURE
- else:
- interface.moveToPage(moduleTitle=_("Finish Updates Setup"))
- return RESULT_JUMP
- return RESULT_SUCCESS
-
- def createScreen(self):
- self.vbox = gtk.VBox(spacing=5)
-
- def initializeUI(self):
- if self.start_page_vbox:
- self.start_page_vbox.destroy()
-
- self.start_page_vbox = self._getVbox()
- self.vbox.pack_start(self.start_page_vbox, True, True)
-
- def _system_is_registered(self):
- if rhnreg.registered():
- return True
- try:
- _rhsm_path = "/usr/share/rhsm/subscription_manager"
- _rhsm_path_added = False
- if _rhsm_path not in sys.path:
- sys.path.append(_rhsm_path)
- _rhsm_path_added = True
- import certlib
- if _rhsm_path_added:
- sys.path.remove(_rhsm_path)
- return certlib.ConsumerIdentity.existsAndValid()
- except:
- return False
-
- def _getVbox(self):
- if self._system_is_registered():
- self.start_page = KsRegisteredPage()
- self.skip_registration = True
- return self.start_page.startPageVbox()
- if _haveNetwork():
- self.start_page = rhnregGui.StartPage(firstboot=True)
- else:
- self.start_page = NoNetworkPage()
- self.skip_registration = True
- return self.start_page.startPageVbox()
-
-class KsRegisteredPage:
-
- def __init__(self):
- gladefile = "/usr/share/rhn/up2date_client/rh_register.glade"
- ksRegisteredXml = gtk.glade.XML(gladefile, "ksRegisteredFirstbootVbox",
- domain="rhn-client-tools")
- self.vbox = ksRegisteredXml.get_widget('ksRegisteredFirstbootVbox')
-
- def startPageVbox(self):
- return self.vbox
-
- def startPageRegisterNow(self):
- return True
-
-
-class NoNetworkPage:
-
- def __init__(self):
- gladefile = "/usr/share/rhn/up2date_client/rh_register.glade"
- noNetworkXml = gtk.glade.XML(gladefile, "noNetworkFirstbootVbox",
- domain="rhn-client-tools")
- self.vbox = noNetworkXml.get_widget('noNetworkFirstbootVbox')
- noNetworkXml.signal_autoconnect({
- "on_whyRegisterButton_clicked" : self.why_register_button_clicked,
- })
-
- def startPageVbox(self):
- return self.vbox
-
- def startPageRegisterNow(self):
- # Sure, we'll register now. heh heh heh
- # Just continue on past the rhn stuff.
- return True
-
- def why_register_button_clicked(self, button):
- rhnregGui.WhyRegisterDialog()
-
diff --git a/client/rhel/rhn-client-tools/src/up2date_client/config.py b/client/rhel/rhn-client-tools/src/up2date_client/config.py
index 8b40a04..9596749 100644
--- a/client/rhel/rhn-client-tools/src/up2date_client/config.py
+++ b/client/rhel/rhn-client-tools/src/up2date_client/config.py
@@ -26,7 +26,7 @@ Defaults = {
'enableProxy' : ("Use a HTTP Proxy",
0),
'serverURL' : ("Remote server URL",
- "https://xmlrpc.rhn.redhat.com/XMLRPC"),
+ "https://your.server.url.here/XMLRPC"),
'debug' : ("Whether or not debugging is enabled",
0),
'systemIdPath' : ("Location of system id",
@@ -35,7 +35,7 @@ Defaults = {
"system version",
""),
'httpProxy' : ("HTTP proxy in host:port format, e.g. "\
- "squid.redhat.com:3128",
+ "squid.example.com:3128",
""),
'proxyUser' : ("The username for an authenticated proxy",
""),
@@ -47,7 +47,7 @@ Defaults = {
"connections before giving up",
1),
'sslCACert' : ("The CA cert used to verify the ssl server",
- "/usr/share/rhn/RHNS-CA-CERT"),
+ "/usr/share/rhn/RHN-ORG-TRUSTED-SSL-CERT"),
'noReboot' : ("Disable the reboot action",
0),
'disallowConfChanges': ("Config options that can not be overwritten by a config update action",
@@ -65,7 +65,7 @@ class ConfigFile:
self.fileName = filename
if self.fileName:
self.load()
-
+
def load(self, filename = None):
if filename:
self.fileName = filename
@@ -153,7 +153,7 @@ class ConfigFile:
if not os.access(os.path.dirname(self.fileName), os.R_OK):
print _("%s was not found" % os.path.dirname(self.fileName))
return
-
+
f = open(self.fileName+'.new', "w")
os.chmod(self.fileName, 0600)
@@ -185,14 +185,14 @@ class ConfigFile:
def update(self, dict):
self.dict.update(dict)
-
+
# we return None when we reference an invalid key instead of
# raising an exception
def __getitem__(self, name):
if self.dict.has_key(name):
return self.dict[name][1]
- return None
-
+ return None
+
def __setitem__(self, name, value):
if self.dict.has_key(name):
val = self.dict[name]
@@ -258,11 +258,11 @@ class Config:
if self.stored.has_key(name):
return self.stored[name]
return None
-
+
# These function expose access to the peristent storage for
# updates and saves
def info(self, name): # retrieve comments
- return self.stored.info(name)
+ return self.stored.info(name)
def save(self):
self.stored.save()
@@ -337,11 +337,11 @@ def initUp2dateConfig(cfg_file = "/etc/sysconfig/rhn/up2date"):
cfg
except NameError:
cfg = None
-
+
if cfg == None:
cfg = Config(cfg_file)
cfg["isatty"] = False
if sys.stdout.isatty():
cfg["isatty"] = True
-
+
return cfg
diff --git a/client/rhel/rhn-client-tools/src/up2date_client/rhnreg.py b/client/rhel/rhn-client-tools/src/up2date_client/rhnreg.py
index 7300904..fbdb0d9 100644
--- a/client/rhel/rhn-client-tools/src/up2date_client/rhnreg.py
+++ b/client/rhel/rhn-client-tools/src/up2date_client/rhnreg.py
@@ -28,7 +28,7 @@ import xmlrpclib
try:
from virtualization import support
except ImportError:
- support = None
+ support = None
import gettext
t = gettext.translation('rhn-client-tools', fallback=True)
@@ -82,7 +82,7 @@ def getOemInfo():
(key, value) = i.split(':')
except ValueError:
raise up2dateErrors.OemInfoFileError(i), None, sys.exc_info()[2]
-
+
info[key] = value.strip()
return info
@@ -114,21 +114,21 @@ def _write_secure_file(secure_file, file_contents):
dir_name = os.path.dirname(secure_file)
if not os.access(dir_name, os.W_OK):
return False
-
+
if os.access(secure_file, os.F_OK):
# already have file there; let's back it up
try:
os.rename(secure_file, secure_file + '.save')
except:
return False
-
+
fd = os.open(secure_file, os.O_WRONLY | os.O_CREAT, 0600)
fd_file = os.fdopen(fd, 'w')
try:
fd_file.write(file_contents)
finally:
fd_file.close()
-
+
return True
def writeSystemId(systemId):
@@ -140,7 +140,7 @@ def writeSystemId(systemId):
removeSystemRegisterRemindFile()
updateRhsmStatus()
-
+
return res
def writeHWCode(hw_activation_code):
@@ -160,7 +160,7 @@ def get_virt_info():
3. Check /sys/hypervisor/uuid. If exists and is non-zero, we know
the system is a para-virt guest; exit.
4. If non of the above checks worked; we know we have a
- non-xen-enabled system; exit.
+ non-xen-enabled system; exit.
"""
# First, check whether /proc/xen/xsd_port exists. If so, we know this is
@@ -169,7 +169,7 @@ def get_virt_info():
if os.path.exists("/proc/xen/xsd_port"):
# Ok, we know this is *at least* a host system. However, it may
# also be a fully-virt guest. Check for that next. If it is, we'll
- # just report that instead since we only support one level of
+ # just report that instead since we only support one level of
# virtualization.
(uuid, virt_type) = get_fully_virt_info()
return (uuid, virt_type)
@@ -193,7 +193,7 @@ def get_virt_info():
def get_para_virt_info():
"""
- This function checks /sys/hypervisor/uuid to see if the system is a
+ This function checks /sys/hypervisor/uuid to see if the system is a
para-virt guest. It returns a (uuid, virt_type) tuple.
"""
try:
@@ -211,7 +211,7 @@ def get_para_virt_info():
def get_fully_virt_info():
"""
- This function looks in the SMBIOS area to determine if this is a
+ This function looks in the SMBIOS area to determine if this is a
fully-virt guest. It returns a (uuid, virt_type) tuple.
"""
vendor = hardware.dmi_vendor()
@@ -231,20 +231,20 @@ def welcomeText():
s = rhnserver.RhnServer()
return s.registration.welcome_message()
-
+
def getCaps():
s = rhnserver.RhnServer()
# figure out if were missing any needed caps
s.capabilities.validate()
-
+
def reserveUser(username, password):
s = rhnserver.RhnServer()
return s.registration.reserve_user(username, password)
class RegistrationResult:
- def __init__(self, systemId, channels, failedChannels, systemSlots,
+ def __init__(self, systemId, channels, failedChannels, systemSlots,
failedSystemSlots, universalActivationKey, rawDict=None):
# TODO Get rid of rawDict
self._systemId = systemId
@@ -257,40 +257,40 @@ class RegistrationResult:
else:
self._universalActivationKey = None
self.rawDict = rawDict
-
+
def getSystemId(self):
return self._systemId
-
+
def getChannels(self):
return self._channels
-
+
def getFailedChannels(self):
return self._failedChannels
-
+
def getSystemSlots(self):
return self._systemSlots
-
+
def getSystemSlotDescriptions(self):
return map(self._getSlotDescription, self._systemSlots)
-
+
def getFailedSystemSlotDescriptions(self):
return map(self._getFailedSlotDescription, self._failedSystemSlots)
-
+
def getUniversalActivationKey(self):
"""Returns None if no universal activation key was used."""
return self._universalActivationKey
-
+
def hasBaseAndUpdates(self):
"""Returns True if the system was subscribed to at least one channel
and was given any type of system slot so it will get updates. In other
- words, returns True if the system will be getting at least basic
+ words, returns True if the system will be getting at least basic
updates.
-
+
"""
- # If it was subscribed to at least one channel, that must include a
+ # If it was subscribed to at least one channel, that must include a
# base channel.
return len(self._channels) > 0 and len(self._systemSlots) > 0
-
+
def _getFailedSlotDescription(self, slot):
if slot in ['virtualization_host', 'virtualization_host_platform']:
return rhnreg_constants.VIRT + " " + rhnreg_constants.VIRT_FAILED
@@ -319,13 +319,13 @@ def registerSystem(username = None, password = None,
token = None, other = None):
"""Wrapper for the old xmlrpc to register a system. Activates subscriptions
if a reg num is given.
-
+
"""
auth_dict = { "profile_name" : profileName,
"os_release" : up2dateUtils.getVersion(),
"release_name" : up2dateUtils.getOSRelease(),
"architecture" : up2dateUtils.getArch() }
- # dict of other bits to send
+ # dict of other bits to send
if other:
for (key, item) in other.items():
auth_dict[key] = item
@@ -337,7 +337,7 @@ def registerSystem(username = None, password = None,
if cfg['supportsSMBIOS']:
auth_dict["smbios"] = _encode_characters(hardware.get_smbios())
-
+
s = rhnserver.RhnServer()
if packages == None:
ret = s.registration.new_system(auth_dict)
@@ -365,50 +365,50 @@ def updateRhsmStatus():
# about a timely reply or what the result might be, we just want
# the method to run. So we can safely ignore this.
pass
-
-
+
+
def getAvailableChannels(username, password):
s = rhnserver.RhnServer()
server_arch = up2dateUtils.getArch()
server_version = up2dateUtils.getVersion()
server_release = up2dateUtils.getRelease()
-
+
availableChannels = None
try:
availableChannels = s.registration.available_eus_channels(
username, password,
- server_arch, server_version,
+ server_arch, server_version,
server_release)
except xmlrpclib.Fault, f:
if f.faultCode == 99:
raise up2dateErrors.DelayError(f.faultString), None, sys.exc_info()[2]
else:
raise
-
+
return availableChannels
-
+
def registerSystem2(username = None, password = None,
profileName = None, packages = None,
activationKey = None, other = {}):
"""Uses the new xmlrpcs to register a system. Returns a dict instead of just
system id.
-
+
The main differences between this and registerSystem and that this doesn't
- do activation and does child channel subscriptions if possible. See the
+ do activation and does child channel subscriptions if possible. See the
documentation for the xmlrpc handlers in backend for more detail.
-
+
If nothing is going to be in other, it can be {} or None.
New in RHEL 5.
-
+
"""
if other is None:
other = {}
-
+
if activationKey:
assert username is None
assert password is None
@@ -418,9 +418,9 @@ def registerSystem2(username = None, password = None,
assert password is not None
assert activationKey is None
for key in other.keys():
- assert key in ['registration_number',
- 'org_id',
- 'virt_uuid',
+ assert key in ['registration_number',
+ 'org_id',
+ 'virt_uuid',
'virt_type',
'channel']
@@ -428,7 +428,7 @@ def registerSystem2(username = None, password = None,
other["smbios"] = _encode_characters(hardware.get_smbios())
s = rhnserver.RhnServer()
-
+
if activationKey:
info = s.registration.new_system_activation_key(profileName,
up2dateUtils.getOSRelease(),
@@ -445,9 +445,9 @@ def registerSystem2(username = None, password = None,
password,
other)
log.log_debug("Returned:\n%s" % info)
- result = RegistrationResult(info['system_id'],
- info['channels'], info['failed_channels'],
- info['system_slots'], info['failed_system_slots'],
+ result = RegistrationResult(info['system_id'],
+ info['channels'], info['failed_channels'],
+ info['system_slots'], info['failed_system_slots'],
info['universal_activation_key'],
rawDict=info)
return result
@@ -464,7 +464,7 @@ def sendHardware(systemId, hardwareList):
if not s.capabilities.hasCapability('ipv6', 1):
hardwareList = map(remove_ip6addr, hardwareList)
s.registration.add_hw_profile(systemId, _encode_characters(hardwareList))
-
+
def sendPackages(systemId, packageList):
s = rhnserver.RhnServer()
if not s.capabilities.hasCapability('xmlrpc.packages.extended_profile', 2):
@@ -481,9 +481,9 @@ def listPackages(systemId):
print s.registration.list_packages,systemId()
def makeNiceServerUrl(server):
- """Raises up2dateErrors.InvalidProtocolError if the server url has a
+ """Raises up2dateErrors.InvalidProtocolError if the server url has a
protocol specified and it's not http or https.
-
+
"""
protocol, host, path, parameters, query, fragmentIdentifier = urlparse.urlparse(server)
if protocol is None or protocol == '':
@@ -497,7 +497,7 @@ def makeNiceServerUrl(server):
"http are allowed.")
if path is None or path == '' or path == '/':
path = '/XMLRPC'
- server = urlparse.urlunparse((protocol, host, path, parameters, query,
+ server = urlparse.urlunparse((protocol, host, path, parameters, query,
fragmentIdentifier))
# TODO Raise an exception if url isn't valid
return server
@@ -505,44 +505,28 @@ def makeNiceServerUrl(server):
def getServerType(serverUrl=None):
"""Returns 'hosted' if the url points to a known hosted server. Otherwise
returns 'satellite'.
-
- If serverUrl is not specified, it is read from the config entry 'serverURL'.
-
"""
- if serverUrl is None:
- serverUrl = config.getServerlURL()[0]
-
- serverUrl = makeNiceServerUrl(serverUrl)
- protocol, host, path, parameters, query, fragmentIdentifier = \
- urlparse.urlparse(serverUrl)
-
- hosted_whitelist = cfg['hostedWhitelist']
-
- if host in ['xmlrpc.rhn.redhat.com', 'rhn.redhat.com'] or \
- hosted_whitelist is not None and host in hosted_whitelist:
- return 'hosted'
- else:
- return 'satellite'
+ return 'satellite'
class ActivationResult:
ACTIVATED_NOW = 0
ALREADY_USED = 1
-
+
def __init__(self, status, registrationNumber, channels={}, systemSlots={}):
- """channels and systemSlots are dicts where the key/value pairs are
+ """channels and systemSlots are dicts where the key/value pairs are
label (string) / quantity (int).
-
+
"""
self._status = status
# TODO Validate reg num
self._regNum = registrationNumber
self._channels = channels
self._systemSlots = systemSlots
-
+
def getStatus(self):
return self._status
-
+
def getRegistrationNumber(self):
return self._regNum
@@ -607,23 +591,23 @@ def _activate_hardware(login, password):
def activateHardwareInfo(username, password, hardwareInfo, orgId=None):
"""Tries to activate an entitlement linked to the hardware info that we
read from the bios.
-
+
Returns an ActivationResult.
Can raise:
Invalid number.
Hardware info is not entitling.
Communication errors, etc
-
+
"""
## import pprint
## pprint.pprint(hardwareInfo)
-
+
other = {}
if orgId:
other = {'org_id': orgId}
-
+
server = rhnserver.RhnServer()
- result = server.registration.activate_hardware_info(username, password,
+ result = server.registration.activate_hardware_info(username, password,
hardwareInfo, other)
statusCode = result['status_code']
regNum = result['registration_number']
diff --git a/client/rhel/rhn-client-tools/src/up2date_client/rhnregGui.py b/client/rhel/rhn-client-tools/src/up2date_client/rhnregGui.py
index 158a7d5..3dc260e 100644
--- a/client/rhel/rhn-client-tools/src/up2date_client/rhnregGui.py
+++ b/client/rhel/rhn-client-tools/src/up2date_client/rhnregGui.py
@@ -30,24 +30,24 @@
# this is a module containing classes for the registration related windows in
# gui.py. The code is split up so we can reuse it in the firstboot modules
"""
-Explanation of the RHN registration gui and how it is used from both
+Explanation of the RHN registration gui and how it is used from both
rhn_register and firstboot (from alikins):
-Most of the "work" happens in rhnregGui.py. Thats where the
+Most of the "work" happens in rhnregGui.py. Thats where the
logic for the screens is.
-gui.py has Gui which is the big monster class (using druid) that makes up the
-main gui wizard for up2date/rhn_register. Gui implements showing the pages for
-up2date/rhn_register. For up2date/rhnreg, it has methods that load the classes
-from rhnregGui (by multiple inheritance...), but it's not too bad, it's all
-mixin stuff, nothing wacky, no overridden methods or anything.
-firstboot/* does more or less the same thing, but with a different style of
-wrapper just to present the firstboot style api's. (Each "page" in firstboot is
+gui.py has Gui which is the big monster class (using druid) that makes up the
+main gui wizard for up2date/rhn_register. Gui implements showing the pages for
+up2date/rhn_register. For up2date/rhnreg, it has methods that load the classes
+from rhnregGui (by multiple inheritance...), but it's not too bad, it's all
+mixin stuff, nothing wacky, no overridden methods or anything.
+firstboot/* does more or less the same thing, but with a different style of
+wrapper just to present the firstboot style api's. (Each "page" in firstboot is
a module with a class that inherits FirstBootGuiWindow.)
"""
import urlparse
import gtk
-# Need to import gtk.glade to make this file work alone even though we always
-# access it as gtk.glade. Not sure why. Maybe gtk's got weird hackish stuff
+# Need to import gtk.glade to make this file work alone even though we always
+# access it as gtk.glade. Not sure why. Maybe gtk's got weird hackish stuff
# going on?
import gtk.glade
import gobject
@@ -87,7 +87,7 @@ hw_activation_code = None
serverType = None
chosen_channel = None
-# _hasBaseChannelAndUpdates gets set by the code in create profile which
+# _hasBaseChannelAndUpdates gets set by the code in create profile which
# registers the system and used by hasBaseChannelAndUpdates()
_hasBaseChannelAndUpdates = False
_autoActivatedNumbers = False # used by autoActivateNumbersOnce()
@@ -98,7 +98,7 @@ class ReviewLog:
self._boldTag = self._text.create_tag(weight=700)
def prependBoldText(self, text):
- """Adds a blob of bolded text to the beggining specified section. Adds a newline
+ """Adds a blob of bolded text to the beggining specified section. Adds a newline
after the text.
"""
self.prependText(text)
@@ -109,9 +109,9 @@ class ReviewLog:
self._text.apply_tag(self._boldTag, startOfText, endOfText)
def addBoldText(self, text):
- """Adds a blob of bolded text to the specified section. Adds a newline
+ """Adds a blob of bolded text to the specified section. Adds a newline
after the text.
-
+
"""
self.addText(text)
# Make it bold
@@ -130,17 +130,17 @@ class ReviewLog:
def addText(self, text):
"""Adds a blob of text to the specified section. Adds a newline after
the text.
-
+
"""
end = self._text.get_end_iter()
self._text.insert(end, text + '\n')
-
+
def addBulletedText(self, text):
self.addText(u'\u2022' + ' ' + text)
-
+
def getTextBuffer(self):
return self._text
-
+
def usedUniversalActivationKey(self, keyName):
self.addBoldText(_("Notice"))
keys = ', '.join(keyName)
@@ -175,12 +175,7 @@ class ReviewLog:
for channel in subscribedChannels:
self.addBulletedText(channel)
- # If it's hosted, reference the hosted url,
- # otherwise, we don't know the url for their sat.
- if serverType == 'hosted':
- self.addText(rhnreg_constants.CHANNELS_HOSTED_WARNING)
- else:
- self.addText(rhnreg_constants.CHANNELS_SAT_WARNING)
+ self.addText(rhnreg_constants.CHANNELS_SAT_WARNING)
else:
self.addText(rhnreg_constants.NO_BASE_CHANNEL)
if len(failedChannels) > 0:
@@ -188,7 +183,7 @@ class ReviewLog:
for channel in failedChannels:
self.addBulletedText(channel)
self.addText('') # adds newline
-
+
def systemSlots(self, slots, failedSlots):
self.addBoldText(rhnreg_constants.SLOTS_TITLE)
self.addText(rhnreg_constants.OK_SLOTS)
@@ -202,15 +197,15 @@ class ReviewLog:
for slot in failedSlots:
self.addBulletedText(slot)
self.addText('') # adds newline
-
+
reviewLog = ReviewLog()
class StartPage:
"""There is a section of this page which asks if the user wants to register,
- which will only be shown in firstboot. This is specified by the arg to the
+ which will only be shown in firstboot. This is specified by the arg to the
constructor.
-
+
"""
def __init__(self, firstboot=False):
self.startXml = gtk.glade.XML(gladefile, "startWindowVbox",
@@ -224,10 +219,10 @@ class StartPage:
startWindowVbox = self.startXml.get_widget("startWindowVbox")
chooseToRegisterVbox = self.startXml.get_widget('chooseToRegisterVbox')
startWindowVbox.remove(chooseToRegisterVbox)
-
+
def startPageVbox(self):
return self.startXml.get_widget("startWindowVbox")
-
+
def startPageWhyRegisterButton(self, button):
WhyRegisterDialog()
@@ -235,47 +230,32 @@ class StartPage:
MoreInfoDialog()
def startPageRegisterNow(self):
- """Returns True if the user has selected to register now. False if
+ """Returns True if the user has selected to register now. False if
they've selected to register later.
-
"""
return self.registerNowButton.get_active()
class ChooseServerPage:
def __init__(self):
- self.chooseServerXml = gtk.glade.XML(gladefile,
+ self.chooseServerXml = gtk.glade.XML(gladefile,
"chooseServerWindowVbox",
domain="rhn-client-tools")
self.chooseServerXml.signal_autoconnect ({
- "onSatelliteButtonToggled" : self.onSatelliteButtonToggled,
"onAdvancedNetworkConfigurationButtonClicked" : self.showNetworkConfigDialog
})
- self.hostedButton = self.chooseServerXml.get_widget('hostedButton')
- self.satelliteButton = self.chooseServerXml.get_widget('satelliteButton')
self.customServerEntry = self.chooseServerXml.get_widget('satelliteServerEntry')
-
+
self.customServerBox = self.chooseServerXml.get_widget('customServerTable')
def chooseServerPagePrepare(self):
self.server = config.getServerlURL()[0]
-
log.log_debug("server is %s" % self.server)
- if "rhn.redhat.com/XMLRPC" in self.server:
- self.hostedButton.set_active(True)
- else:
- self.satelliteButton.set_active(True)
- self.customServerEntry.set_text(self.server)
-
+ self.customServerEntry.set_text(self.server)
+
def chooseServerPageVbox(self):
return self.chooseServerXml.get_widget("chooseServerWindowVbox")
-
- def onSatelliteButtonToggled(self, entry):
- is_sensitive = False
- if self.satelliteButton.get_active():
- is_sensitive = True
- self.customServerBox.set_sensitive(is_sensitive)
-
+
def showNetworkConfigDialog(self, button):
NetworkConfigDialog()
@@ -293,37 +273,32 @@ class ChooseServerPage:
return False
else:
return True
-
+
def _chooseServerPageApply(self):
"""Returns True if an error happened so we shouldn't advance to the next
screen, but it was already dealt with. False if everything is peachy.
- Can probably raise all sorts of exceptions, but I wish it only raised
+ Can probably raise all sorts of exceptions, but I wish it only raised
SSLCertificateVerifyFailedError.
"""
global serverType
up2dateConfig = config.initUp2dateConfig()
- if self.hostedButton.get_active():
- config.setServerURL('https://xmlrpc.rhn.redhat.com/XMLRPC')
- if not cfg['sslCACert']:
- up2dateConfig.set('sslCACert', '/usr/share/rhn/RHNS-CA-CERT')
- else:
- customServer = self.customServerEntry.get_text()
- try:
- customServer = rhnreg.makeNiceServerUrl(customServer)
- except up2dateErrors.InvalidProtocolError:
- errorWindow(_('You specified an invalid protocol. Only '
- 'https and http are allowed.'))
- return True
+ customServer = self.customServerEntry.get_text()
+ try:
+ customServer = rhnreg.makeNiceServerUrl(customServer)
+ except up2dateErrors.InvalidProtocolError:
+ errorWindow(_('You specified an invalid protocol. Only '
+ 'https and http are allowed.'))
+ return True
- # If they changed the value, write it back to the config file.
- if customServer != self.server:
- config.setServerURL(customServer)
- if not cfg['sslCACert']:
- up2dateConfig.set('sslCACert',
- '/usr/share/rhn/RHN-ORG-TRUSTED-SSL-CERT')
+ # If they changed the value, write it back to the config file.
+ if customServer != self.server:
+ config.setServerURL(customServer)
+ if not cfg['sslCACert']:
+ up2dateConfig.set('sslCACert',
+ '/usr/share/rhn/RHN-ORG-TRUSTED-SSL-CERT')
serverType = rhnreg.getServerType()
-
+
NEED_SERVER_MESSAGE = _("You will not be able to successfully register "
"this system without contacting a Red Hat Network server.")
@@ -345,25 +320,14 @@ class ChooseServerPage:
log.log_exception(*sys.exc_info())
protocol, host, path, parameters, query, fragmentIdentifier = urlparse.urlparse(config.getServerlURL()[0])
dialog = messageWindow.BulletedOkDialog(_("Cannot contact selected server"))
- if serverType == 'hosted':
- dialog.add_text(_("We could not contact Red Hat Network (%s).")
- % host)
- dialog.add_bullet(_("Make sure the network connection on this "
- "system is operational."))
- dialog.add_bullet(_("Did you mean to register to a Red Hat "
- "Network Satellite or Proxy? If so, you can "
- "enter a Satellite or Proxy location "
- "instead."))
- dialog.add_text(NEED_SERVER_MESSAGE)
- else:
- dialog.add_text(_("We could not contact the Satellite or Proxy "
- "at '%s.'") % host)
- dialog.add_bullet(_("Double-check the location - is '%s' "
- "correct? If not, you can correct it and "
- "try again.") % host)
- dialog.add_bullet(_("Make sure the network connection on this "
- "system is operational."))
- dialog.add_text(NEED_SERVER_MESSAGE)
+ dialog.add_text(_("We could not contact the Satellite or Proxy "
+ "at '%s.'") % host)
+ dialog.add_bullet(_("Double-check the location - is '%s' "
+ "correct? If not, you can correct it and "
+ "try again.") % host)
+ dialog.add_bullet(_("Make sure the network connection on this "
+ "system is operational."))
+ dialog.add_text(NEED_SERVER_MESSAGE)
dialog.run()
return True
except up2dateErrors.RhnServerException:
@@ -392,7 +356,7 @@ class LoginPage:
"LoginPage must be derived from, by a class that implements goToPageAfterLogin."
self.loginXml = gtk.glade.XML(gladefile,
"initialLoginWindowVbox", domain="rhn-client-tools")
- self.loginXml.signal_autoconnect ({
+ self.loginXml.signal_autoconnect ({
"onLoginUserEntryActivate" : self.loginPageAccountInfoActivate,
"onLoginPasswordEntryActivate" : self.loginPageAccountInfoActivate,
})
@@ -400,42 +364,28 @@ class LoginPage:
self.loginPageHostedLabelText = instructionsLabel.get_label()
def loginPagePrepare(self):
- """Changes the screen slightly depending on whether hosted or satellite
- is being used.
-
+ """Changes the screen slightly for satellite.
"""
- assert serverType in ['hosted', 'satellite']
+ assert serverType in ['satellite']
instructionsLabel = self.loginXml.get_widget('instructionsLabel')
- forgotInfoHosted = self.loginXml.get_widget('forgotInfoHosted')
- forgotInfoSatellite = self.loginXml.get_widget('forgotInfoSatellite')
- tipIconHosted = self.loginXml.get_widget('tipIconHosted')
tipIconSatellite = self.loginXml.get_widget('tipIconSatellite')
server = config.getServerlURL()[0]
- if serverType == 'satellite':
- protocol, host, path, parameters, query, fragmentIdentifier = urlparse.urlparse(server)
- satelliteText = _("Please enter your account information for the <b>%s</b> Red Hat Network Satellite:") % host
- instructionsLabel.set_label(satelliteText)
- forgotInfoHosted.hide()
- forgotInfoSatellite.show()
- tipIconHosted.hide()
- tipIconSatellite.show()
- else: # Hosted
- instructionsLabel.set_label(self.loginPageHostedLabelText)
- forgotInfoSatellite.hide()
- forgotInfoHosted.show()
- tipIconSatellite.hide()
- tipIconHosted.show()
-
+ protocol, host, path, parameters, query, fragmentIdentifier = urlparse.urlparse(server)
+ satelliteText = _("Please enter your account information for the <b>%s</b> Red Hat Network Satellite:") % host
+ instructionsLabel.set_label(satelliteText)
+ #forgotInfoSatellite.show()
+ #tipIconSatellite.show()
+
def loginPageVbox(self):
return self.loginXml.get_widget("initialLoginWindowVbox")
def loginPageAccountInfoActivate(self, entry):
"""Handles activation (hitting enter) in the username and password fields.
-
+
If a password was entered or the focus is already in the password field,
- tries to advance the screen if possible. If focus in elsewhere and
+ tries to advance the screen if possible. If focus in elsewhere and
nothing is in the password field, puts the focus in there.
-
+
"""
passwordEntry = self.loginXml.get_widget("loginPasswordEntry")
if entry == passwordEntry or len(passwordEntry.get_text()) > 0:
@@ -444,9 +394,9 @@ class LoginPage:
self.onLoginPageNext(None, None)
else:
passwordEntry.grab_focus()
-
+
def loginPageVerify(self):
- """Returns True if there's an error with the user input, False
+ """Returns True if there's an error with the user input, False
otherwise.
"""
self.loginPw = self.loginXml.get_widget("loginPasswordEntry")
@@ -470,31 +420,11 @@ class LoginPage:
self.loginPw.grab_focus()
return True
- # this is hosted only and will test login/password as side effect
- # we need it for chooseChannel page, but it set global variable
- # so we can call it here and verify login to hosted
- try:
- try_to_activate_hardware()
- except up2dateErrors.ValidationError, e:
- setArrowCursor()
- self.alreadyRegistered = 0
- log.log_me("An exception was raised causing login to fail. This is "
- "usually correct. Exception information:")
- log.log_exception(*sys.exc_info())
- errorWindow(e.errmsg)
- return True
- except up2dateErrors.CommunicationError, e:
- setArrowCursor()
- print e.errmsg
- self.fatalError(_("There was an error communicating with the registration server. The message was:\n") + e.errmsg)
- return True # fatalError in firstboot will return to here
-
return False
def loginPageApply(self):
- """Returns True if an error happened (the user will have gotten an error
+ """Returns True if an error happened (the user will have gotten an error
message) or False if everything was ok.
-
"""
status = callAndFilterExceptions(
self._loginPageApply,
@@ -505,7 +435,7 @@ class LoginPage:
return False
else:
return True
-
+
def _loginPageApply(self):
"""Returns False if everything's ok, True if there was a problem."""
try:
@@ -526,10 +456,10 @@ class LoginPage:
print e.errmsg
self.fatalError(_("There was an error communicating with the registration server. The message was:\n") + e.errmsg)
return True # fatalError in firstboot will return to here
-
+
setArrowCursor()
return False
-
+
class ReviewSubscriptionPage:
def __init__(self):
@@ -538,26 +468,26 @@ class ReviewSubscriptionPage:
domain="rhn-client-tools")
self.reviewTextView = \
self.reviewSubscriptionXml.get_widget("reviewTextView")
-
+
def reviewSubscriptionPagePrepare(self):
self.reviewTextView.set_buffer(reviewLog.getTextBuffer())
-
+
def reviewSubscriptionPageVbox(self):
return self.reviewSubscriptionXml.get_widget("reviewSubscriptionWindowVbox")
class ConfirmAllUpdatesDialog:
def __init__(self):
- self.xml = gtk.glade.XML(gladefile, "confirmAllUpdatesDialog",
+ self.xml = gtk.glade.XML(gladefile, "confirmAllUpdatesDialog",
domain="rhn-client-tools")
self.dialog = self.xml.get_widget("confirmAllUpdatesDialog")
-
+
self.rc = self.dialog.run()
if self.rc != 1:
self.rc = 0
self.dialog.destroy()
-
+
class ChooseChannelPage:
def __init__(self):
self.chooseChannelXml = gtk.glade.XML(gladefile,
@@ -569,35 +499,35 @@ class ChooseChannelPage:
self.all_updates_button = self.chooseChannelXml.get_widget("all_updates_button")
self.chose_all_updates = False
self.chose_default_channel = True
-
+
def chooseChannelPageVbox(self):
return self.chooseChannelXml.get_widget("chooseChannelWindowVbox")
-
+
def channel_changed_cb(self, combobox):
self.limited_updates_button.set_active(True)
-
+
def chooseChannelPagePrepare(self):
-
+
global username, password
# The self.eus_channels was populated in chooseChannelShouldBeShown
self.channels = self.eus_channels['channels']
self.receiving_updates = self.eus_channels['receiving_updates']
-
+
list_entry = gtk.ListStore(gobject.TYPE_STRING)
self.chooseChannelList.set_model(list_entry)
cell = gtk.CellRendererText()
self.chooseChannelList.pack_start(cell, False)
-
+
self.chooseChannelList.connect('changed', self.channel_changed_cb)
-
+
self.chooseChannelList.remove_text(0)
for label, name in self.channels.items():
if label in self.receiving_updates:
self.channels[label] = name + ' *'
-
+
channel_values = self.channels.values()
channel_values.sort()
for name in channel_values:
@@ -605,9 +535,9 @@ class ChooseChannelPage:
self.chooseChannelList.set_active(0)
self.all_updates_button.set_active(True)
-
+
setArrowCursor()
-
+
def chooseChannelPageApply(self):
if self.limited_updates_button.get_active():
global chosen_channel
@@ -621,11 +551,11 @@ class ChooseChannelPage:
self.chose_default_channel = False
else:
self.chose_default_channel = True
-
+
return True
else:
self.chose_all_updates = True
-
+
def chooseChannelShouldBeShown(self):
'''
Returns True if the choose channel window should be shown, else
@@ -657,7 +587,7 @@ class CreateProfilePage:
self.activationNoPackages = None # used by fb
self.noChannels = None # used by fb
self.serviceNotEnabled = None # used by fb
-
+
def createProfilePagePrepare(self):
callAndFilterExceptions(
self._createProfilePagePrepare,
@@ -667,16 +597,16 @@ class CreateProfilePage:
def _createProfilePagePrepare(self):
# There was a comment by these calls that said "part of fix for #144704"
- # I don't understand how the code fixed that bug. It might be that
- # they had originally been run at screen initialization which would
+ # I don't understand how the code fixed that bug. It might be that
+ # they had originally been run at screen initialization which would
# break stuff and it was changed to only run them when the user got
# to this screen.
self.getHardware()
self.populateProfile()
-
+
def createProfilePageVbox(self):
return self.createProfileXml.get_widget("createProfileWindowVbox")
-
+
# we cant do this on module load because there might be a valid interface
# but zero connectivity
def getHardware(self):
@@ -684,7 +614,7 @@ class CreateProfilePage:
self.hardware = hardware.Hardware()
except:
print _("Error running hardware profile")
-
+
def populateProfile(self):
try:
if not self.initProfile:
@@ -699,7 +629,7 @@ class CreateProfilePage:
ipaddr = hw.get('ipaddr')
ip6addr = hw.get('ip6addr')
# the check against "unknown" is a bit lame, but it's
- # the minimal change to fix #144704
+ # the minimal change to fix #144704
if hostname and (hostname != "unknown"):
profileName = hostname
elif ipaddr:
@@ -715,17 +645,17 @@ class CreateProfilePage:
except:
unexpectedError(_("There was an error while populating the profile."), sys.exc_info())
setArrowCursor()
-
+
def createProfilePageShowHardwareDialog(self, button):
HardwareDialog()
-
+
def createProfilePageShowPackageDialog(self, button):
PackageDialog()
-
+
def createProfilePageVerify(self):
- """Returns True if an error happened (the user will have gotten an error
+ """Returns True if an error happened (the user will have gotten an error
message) or False if everything was ok.
-
+
"""
systemNameEntry = self.createProfileXml.get_widget("systemNameEntry")
sendHardwareButton = self.createProfileXml.get_widget("sendHardwareButton")
@@ -739,11 +669,10 @@ class CreateProfilePage:
if not self.sendPackages:
self.activationNoPackages = 1
return False
-
+
def createProfilePageApply(self):
- """Returns True if an error happened (the user will have gotten an error
+ """Returns True if an error happened (the user will have gotten an error
message) or False if everything was ok.
-
"""
status = callAndFilterExceptions(
self._createProfilePageApply,
@@ -754,12 +683,12 @@ class CreateProfilePage:
return False
else:
return True
-
+
def _createProfilePageApply(self):
"""Returns False if everything's ok or True if something's wrong."""
setBusyCursor()
pwin = progress.Progress()
- pwin.setLabel(_("Registering system and sending profile information to Red Hat. Please wait."))
+ pwin.setLabel(_("Registering system and sending profile information. Please wait."))
self.systemId = None
global username, password, hw_activation_code, \
_hasBaseChannelAndUpdates, chosen_channel
@@ -775,9 +704,9 @@ class CreateProfilePage:
other['virt_type'] = virt_type
profileName = self.createProfileXml.get_widget("systemNameEntry").get_text()
-
+
pwin.setProgress(1, 6)
-
+
pwin.setStatusLabel(_("Registering System"))
try:
reg_info = rhnreg.registerSystem2(username, password, profileName, other=other)
@@ -788,7 +717,7 @@ class CreateProfilePage:
reviewLog.usedUniversalActivationKey(
reg_info.getUniversalActivationKey())
reviewLog.channels(reg_info.getChannels(), reg_info.getFailedChannels())
- reviewLog.systemSlots(reg_info.getSystemSlotDescriptions(),
+ reviewLog.systemSlots(reg_info.getSystemSlotDescriptions(),
reg_info.getFailedSystemSlotDescriptions())
except up2dateErrors.CommunicationError, e:
pwin.hide()
@@ -817,7 +746,7 @@ class CreateProfilePage:
log.log_exception(*sys.exc_info())
return True
pwin.setProgress(2,6)
-
+
# write the system id out.
if self.systemId:
if not rhnreg.writeSystemId(self.systemId):
@@ -851,7 +780,7 @@ class CreateProfilePage:
import time
time.sleep(1)
pwin.setProgress(4, 6)
-
+
if self.sendPackages:
getArch = 0
if cfg['supportsExtendedPackageProfile']:
@@ -892,7 +821,7 @@ class CreateProfilePage:
except up2dateErrors.RhnServerException, e:
self.fatalError(str(e), wrap=0)
return True # fatalError in firstboot will return to here
-
+
if li:
# see if we have any active channels
if li['X-RHN-Auth-Channels'] == []:
@@ -912,14 +841,14 @@ class CreateProfilePage:
rhnreg.spawnRhnCheckForUI()
pwin.setProgress(6,6)
pwin.hide()
-
+
setArrowCursor()
return False
-
-
+
+
def __updateContactInfo(self, productInfo, uname, password, pwin):
- return False
-
+ return False
+
def __registerProduct(self, productInfo, pwin):
return False
@@ -929,56 +858,56 @@ class ProvideCertificatePage:
self.provideCertificateXml = gtk.glade.XML(gladefile,
"provideCertificateWindowVbox",
domain="rhn-client-tools")
-
+
self.orig_cert_label_template = self.provideCertificateXml.get_widget("SecurityCertLabel").get_text()
def provideCertificatePageVbox(self):
return self.provideCertificateXml.get_widget("provideCertificateWindowVbox")
def setUrlInWidget(self):
- """
- sets the security cert label's server url at runtime
+ """
+ sets the security cert label's server url at runtime
"""
securityCertlabel = self.provideCertificateXml.get_widget("SecurityCertLabel")
securityCertlabel.set_text(self.orig_cert_label_template % config.getServerlURL()[0] )
def provideCertificatePageApply(self):
- """If the 'I have a cert' radio button is selected, this function will
- copy the cert to /usr/share/rhn. If we're using hosted it will name it
- RHNS-CA-CERT otherwise it will name it RHN-ORG-TRUSTED-SSL-CERT. It will
- change the owner to root and the perms to 644. If a file with
- that name already exists it will add a '.save<lowest available integer>' to
- the end of the old file's name. It will update the config file to point
+ """If the 'I have a cert' radio button is selected, this function will
+ copy the cert to /usr/share/rhn. It will name it
+ RHN-ORG-TRUSTED-SSL-CERT. It will
+ change the owner to root and the perms to 644. If a file with
+ that name already exists it will add a '.save<lowest available integer>' to
+ the end of the old file's name. It will update the config file to point
to the new cert.
Returns:
0- cert was installed
1- the user doesn't want to provide a cert right now
2- an error occurred and the user was notified
- 3- the cert was installed ok, but the server doesn't support needed
+ 3- the cert was installed ok, but the server doesn't support needed
calls
Doesn't raise any exceptions.
"""
status = callAndFilterExceptions(
self._provideCertificatePageApply,
- [],
+ [],
_("There was an error while installing the certificate.")
)
if status == 0 or status == 1 or status == 3:
return status
else:
return 2
-
+
def _provideCertificatePageApply(self):
- """Does what the comment for provideCertificatePageApply says, but might
+ """Does what the comment for provideCertificatePageApply says, but might
raise various exceptions.
-
+
"""
CERT_INSTALLED = 0
NOT_INSTALLING_CERT = 1
ERROR_WAS_HANDLED = 2
SERVER_TOO_OLD = 3
-
- assert serverType in ['hosted', 'satellite']
+
+ assert serverType in ['satellite']
try:
provideCertButton = self.provideCertificateXml.get_widget("provideCertificateButton")
provideCert = provideCertButton.get_active()
@@ -990,10 +919,7 @@ class ProvideCertificatePage:
errorWindow(_("You must select a certificate."))
return ERROR_WAS_HANDLED
up2dateConfig = config.initUp2dateConfig()
- if serverType == 'hosted':
- destinationName = '/usr/share/rhn/RHNS-CA-CERT'
- else: # Satellite
- destinationName = '/usr/share/rhn/RHN-ORG-TRUSTED-SSL-CERT'
+ destinationName = '/usr/share/rhn/RHN-ORG-TRUSTED-SSL-CERT'
if certFile != destinationName:
if os.path.exists(certFile):
destinationName = certFile
@@ -1018,13 +944,13 @@ class ProvideCertificatePage:
return ERROR_WAS_HANDLED
except OpenSSL.SSL.Error:
- # TODO Modify rhnlib to raise a unique exception for the not a
+ # TODO Modify rhnlib to raise a unique exception for the not a
# cert file case.
errorWindow(_("There was an SSL error. This could be because the file you picked was not a certificate file."))
return ERROR_WAS_HANDLED
return CERT_INSTALLED
-
+
except IOError, e:
# TODO Provide better messages
message = _("Something went wrong while installing the new certificate:\n")
@@ -1036,7 +962,7 @@ class ProvideCertificatePage:
class FinishPage:
"""The finish screen. This can show two different versions: successful and
unsuccessful.
-
+
"""
def __init__(self):
self.failedFinishXml = gtk.glade.XML(gladefile,
@@ -1055,10 +981,10 @@ class FinishPage:
self.successfulFinishXml.get_widget("successfulFinishWindowVbox")
# Put one in now (either one) to make the prepare code simpler
self.finishContainerVbox.pack_start(self.failedFinishVbox)
-
+
def finishPageVbox(self):
return self.finishContainerVbox
-
+
def finishPagePrepare(self):
containerChildren = self.finishContainerVbox.get_children()
assert len(containerChildren) == 1
@@ -1073,18 +999,18 @@ class AlreadyRegisteredDialog:
def __init__(self):
"""Returns when dialog closes. Dialog.rc will be set to 1 if the user
clicked continue, or 0 if they clicked cancel or close the dialog.
-
+
"""
- self.xml = gtk.glade.XML(gladefile, "alreadyRegisteredDialog",
+ self.xml = gtk.glade.XML(gladefile, "alreadyRegisteredDialog",
domain="rhn-client-tools")
self.dialog = self.xml.get_widget("alreadyRegisteredDialog")
-
+
server = _('unknown')
oldUsername = _('unknown')
systemId = _('unknown')
try:
# If the serverURL config value is a list, we have no way of knowing
- # for sure which one the machine registered against,
+ # for sure which one the machine registered against,
# so default to the
# first element.
server = config.getServerlURL()[0]
@@ -1096,11 +1022,11 @@ class AlreadyRegisteredDialog:
systemId = systemIdXml[0][0]['system_id']
except:
pass
-
+
self.xml.get_widget('serverUrlLabel').set_label(server)
self.xml.get_widget('usernameLabel').set_label(oldUsername)
self.xml.get_widget('systemIdLabel').set_label(systemId)
-
+
self.rc = self.dialog.run()
if self.rc != 1:
self.rc = 0
@@ -1127,15 +1053,15 @@ class AlreadyRegisteredSubscriptionManagerDialog:
class ConfirmQuitDialog:
def __init__(self):
"""Returns when dialog closes. Dialog.rc will be set to 0 if the user
- clicked "take me back" or closed the dialog, or 1 if they clicked "i'll
+ clicked "take me back" or closed the dialog, or 1 if they clicked "i'll
register later". I've they clicked I'll register later, the remind file
will be written to disk.
-
+
"""
- self.xml = gtk.glade.XML(gladefile, "confirmQuitDialog",
+ self.xml = gtk.glade.XML(gladefile, "confirmQuitDialog",
domain="rhn-client-tools")
self.dialog = self.xml.get_widget("confirmQuitDialog")
-
+
self.rc = self.dialog.run()
if self.rc == gtk.RESPONSE_NONE:
self.rc = 0
@@ -1168,30 +1094,30 @@ class WhyRegisterDialog:
self.whyRegisterXml.signal_autoconnect({
"onBackToRegistrationButtonClicked" : self.finish,
})
-
+
def finish(self, button):
self.dlg.hide()
self.rc = 1 # What does this do? Is it needed?
-
+
class HardwareDialog:
def __init__(self):
self.hwXml = gtk.glade.XML(
gladefile,
"hardwareDialog", domain="rhn-client-tools")
self.dlg = self.hwXml.get_widget("hardwareDialog")
-
+
self.hwXml.get_widget("okButton").connect("clicked", self.finish)
callAndFilterExceptions(
self.populateHardware,
- [],
+ [],
_("There was an error getting the list of hardware.")
)
def populateHardware(self):
# Read all hardware in
self.hardware = hardware.Hardware()
-
+
for hw in self.hardware:
if hw['class'] == 'CPU':
label = self.hwXml.get_widget("cpuLabel")
@@ -1221,13 +1147,13 @@ class HardwareDialog:
try:
distversion = up2dateUtils.getVersion()
except up2dateErrors.RpmError, e:
- # TODO Do something similar during registration if the same
+ # TODO Do something similar during registration if the same
# situation can happen. Even better, factor out the code to get the
# hardware.
errorWindow(e.errmsg)
distversion = 'unknown'
label.set_text(distversion)
-
+
def finish(self, button):
self.dlg.hide()
self.rc = 1
@@ -1239,12 +1165,12 @@ class PackageDialog:
gladefile,
"packageDialog", domain="rhn-client-tools")
self.dlg = self.swXml.get_widget("packageDialog")
-
+
self.swXml.get_widget("okButton").connect("clicked", self.finish)
-
+
callAndFilterExceptions(
self.populateDialog,
- [],
+ [],
_("There was an error building the list of packages.")
)
@@ -1257,7 +1183,7 @@ class PackageDialog:
self.packageStore.append((nvr, arch))
self.packageTreeView = self.swXml.get_widget("packageTreeView")
self.packageTreeView.set_model(self.packageStore)
-
+
self.packageTreeView.set_rules_hint(True)
col = gtk.TreeViewColumn(_("Package"), gtk.CellRendererText(), text=0)
@@ -1276,7 +1202,7 @@ class PackageDialog:
packageDialogPackages = pkgUtils.getInstalledPackageList(progressCallback = pwin.setProgress, getArch=1)
pwin.hide()
return packageDialogPackages
-
+
def finish(self, button):
self.dlg.hide()
self.rc = 1
@@ -1284,14 +1210,14 @@ class PackageDialog:
class NetworkConfigDialog:
"""This is the dialog that allows setting http proxy settings.
-
- It uses the instant apply paradigm or whatever you wanna call it that the
- gnome HIG recommends. Whenever a toggle button is flipped or a text entry
+
+ It uses the instant apply paradigm or whatever you wanna call it that the
+ gnome HIG recommends. Whenever a toggle button is flipped or a text entry
changed, the new setting will be saved.
-
+
"""
def __init__(self):
- self.xml = gtk.glade.XML(gladefile, "networkConfigDialog",
+ self.xml = gtk.glade.XML(gladefile, "networkConfigDialog",
domain="rhn-client-tools")
# Get widgets we'll need to access
self.dlg = self.xml.get_widget("networkConfigDialog")
@@ -1307,8 +1233,8 @@ class NetworkConfigDialog:
"configuration. Make sure that\nyou "
"have read access to /etc/sysconfig/rhn."),
self.dlg)
- # Need to load values before connecting signals because when the dialog
- # starts up it seems to trigger the signals which overwrites the config
+ # Need to load values before connecting signals because when the dialog
+ # starts up it seems to trigger the signals which overwrites the config
# with the blank values.
self.setInitialValues()
self.enableProxyButton.connect("toggled", self.enableAction)
@@ -1320,7 +1246,7 @@ class NetworkConfigDialog:
self.proxyPasswordEntry.connect("focus-out-event", self.writeValues)
self.xml.get_widget("closeButton").connect("clicked", self.close)
self.dlg.show()
-
+
def setInitialValues(self):
self.xml.get_widget("enableProxyButton").set_active(self.cfg["enableProxy"])
self.enableAction(self.xml.get_widget("enableProxyButton"))
@@ -1329,7 +1255,7 @@ class NetworkConfigDialog:
self.enableAction(self.xml.get_widget("enableProxyAuthButton"))
self.xml.get_widget("proxyUserEntry").set_text(str(self.cfg["proxyUser"]))
self.xml.get_widget("proxyPasswordEntry").set_text(str(self.cfg["proxyPassword"]))
-
+
def writeValues(self, widget=None, dummy=None):
self.cfg.set("enableProxy",
int(self.xml.get_widget("enableProxyButton").get_active()))
@@ -1348,10 +1274,10 @@ class NetworkConfigDialog:
"There was an error saving your configuration. "\
"Make sure that\nyou own %s.") % self.cfg.fileName,
self.dlg)
-
+
def close(self, button):
self.dlg.hide()
-
+
def enableAction(self, button):
if button.get_name() == "enableProxyButton":
self.xml.get_widget("proxyEntry").set_sensitive(button.get_active())
@@ -1368,10 +1294,10 @@ def errorWindow(message):
def unexpectedError(message, exc_info=None):
"""Shows an error dialog with the message and logs that an error happened.
-
+
This function is designed to be used in an except block like so:
unexpectedError(_("Your error here."), sys.exc_info())
-
+
"""
setArrowCursor()
logFile = cfg['logFile'] or '/var/log/up2date'
@@ -1387,16 +1313,16 @@ def unexpectedError(message, exc_info=None):
else:
log.log_me("An unexpected error happened, but exc_info wasn't provided.")
-def callAndFilterExceptions(function, allowedExceptions,
+def callAndFilterExceptions(function, allowedExceptions,
disallowedExceptionMessage, errorHandler=unexpectedError):
"""Calls function and limits the exceptions that can be raised to those in
- the list provided and SystemExit. If an exception is raised which isn't
- allowed, errorHandler will be called and then None will be returned.
- errorHandler defaults to the unexpectedError function and will be passed
- disallowedExceptionMessage. If it is overridden, the function provided must
- take a string and a tuple (see below for details). If no exceptions are
+ the list provided and SystemExit. If an exception is raised which isn't
+ allowed, errorHandler will be called and then None will be returned.
+ errorHandler defaults to the unexpectedError function and will be passed
+ disallowedExceptionMessage. If it is overridden, the function provided must
+ take a string and a tuple (see below for details). If no exceptions are
raised, functions's return value is returned.
-
+
I need this function because if some of the functions in the Pages raise
unexpected exceptions, the druid might advance when it shouldn't or go to
the wrong page. I think it's shorter and more readable to factor this out
@@ -1411,25 +1337,15 @@ def callAndFilterExceptions(function, allowedExceptions,
if exceptionType in allowedExceptions:
raise
else:
- errorHandler(disallowedExceptionMessage,
+ errorHandler(disallowedExceptionMessage,
(exceptionType, exception, stackTrace))
-def try_to_activate_hardware():
- global hw_activation_code
- if serverType == 'hosted':
- # hardware asset codes only make sense on hosted
- setBusyCursor()
- code = rhnreg._activate_hardware(username, password)
- if code != None:
- hw_activation_code = code
- setArrowCursor()
-
def hasBaseChannelAndUpdates():
- """Returns a bool indicating whether the system has registered, subscribed
+ """Returns a bool indicating whether the system has registered, subscribed
to a base channel, and has at least update entitlements.
- Uses information from the most recent time the create profile screen was run
+ Uses information from the most recent time the create profile screen was run
through.
-
+
"""
global _hasBaseChannelAndUpdates
return _hasBaseChannelAndUpdates
@@ -1438,13 +1354,13 @@ def hasBaseChannelAndUpdates():
def setBusyCursor():
"""Dummy function that will be overidden by rhn_register's standalone gui
and firstboot in different ways.
-
+
"""
pass
def setArrowCursor():
"""Dummy function that will be overidden by rhn_register's standalone gui
and firstboot in different ways.
-
+
"""
pass
diff --git a/client/rhel/rhn-client-tools/src/up2date_client/rhnreg_constants.py b/client/rhel/rhn-client-tools/src/up2date_client/rhnreg_constants.py
index 86905e8..f29bf9b 100644
--- a/client/rhel/rhn-client-tools/src/up2date_client/rhnreg_constants.py
+++ b/client/rhel/rhn-client-tools/src/up2date_client/rhnreg_constants.py
@@ -17,11 +17,11 @@ COPYRIGHT_TEXT = _(u"Copyright © 2006--2010 Red Hat, Inc. All rights res
CONNECT_WINDOW = _("Attempting to contact the Red Hat Network server.")
CONNECT_WINDOW_TEXT = _("We are attempting to contact the Red Hat "
"Network server at %s.")
-CONNECT_WINDOW_TEXT2 = _("A proxy was specified at %s.")
+CONNECT_WINDOW_TEXT2 = _("A proxy was specified at %s.")
# Start Window
START_REGISTER_WINDOW = _("System Registration")
-START_REGISTER_TEXT = _("This assistant will guide you through "
+START_REGISTER_TEXT = _("This assistant will guide you through "
"connecting your system to "
"Red Hat Network (RHN) to receive software "
"updates, including "
@@ -34,7 +34,7 @@ START_REGISTER_TEXT = _("This assistant will guide you through "
"or Proxy (optional)\n\n")
# Why Register Window
-WHY_REGISTER = _("Why Should I Connect to RHN? ...")
+WHY_REGISTER = _("Why Should I Connect to RHN? ...")
WHY_REGISTER_WINDOW = _("Why Register")
WHY_REGISTER_TEXT = _("Connecting your system to Red Hat Network allows you to take full "
"advantage of the benefits of a paid subscription, including:")
@@ -50,8 +50,7 @@ WHY_REGISTER_SUPP_TXT = _("Access to the technical support experts at Red Hat or
"with any issues you might encounter with this system.")
WHY_REGISTER_COMP_TXT = _("Stay in compliance with your subscription agreement "
"and manage subscriptions "
- "for systems connected to your account at "
- "http://rhn.redhat.com/.")
+ "for systems connected to your account.")
WHY_REGISTER_TIP = _("Tip: Red Hat values your privacy: "
"http://www.redhat.com/legal/privacy_statement.html")
BACK_REGISTER = _("Take me back to the registration")
@@ -112,10 +111,6 @@ PACKAGES_WINDOW_UNCHECK = _("You may deselect individual packages by"
PACKAGES_WINDOW_PKGLIST = _("Building Package List")
# Product Window
-HOSTED_LOGIN_PROMPT = _("Please enter your login information for Red "
- "Hat Network (http://rhn.redhat.com/):\n\n")
-HOSTED_LOGIN_TIP = _("Tip: Forgot your login or password? "
- "Visit: https://rhn.redhat.com/rhn/sales/LoginInfo.do")
EMAIL = _("*Email Address:")
SYSTEM_ALREADY_SETUP = _("System Already Registered")
@@ -124,8 +119,8 @@ SYSTEM_ALREADY_REGISTERED_CONT = _("Are you sure you would like to continue?")
RHSM_SYSTEM_ALREADY_REGISTERED = _("This system has already been registered with RHN"
" using RHN certficate-based technology.\n\n"
- "The tool you are using is attempting to re-register"
- " using RHN Classic technology. Red Hat recommends "
+ "The tool you are using is attempting to re-register "
+ "using RHN Satellite or RHN Proxy technology. Red Hat recommends "
"(except in a few cases) that customers only register with RHN once.\n\n"
"To learn more about RHN registration and technologies please consult this"
" Knowledge Base Article: https://access.redhat.com/kb/docs/DOC-45563")
@@ -162,7 +157,7 @@ SUB_NUM_RESULT = _("Subscriptions have been activated for the following
"Red Hat products/services:")
CHANNELS_TITLE = _("Software Channel Subscriptions:")
OK_CHANNELS = _("This system will receive updates from the "
- "following RHN Classic software channels:")
+ "following software channels:")
CHANNELS_SAT_WARNING = _("Warning: Only installed product listed above will receive "
"updates and support. If you would like "
"to receive updates for additional products, please "
@@ -171,14 +166,6 @@ CHANNELS_SAT_WARNING = _("Warning: Only installed product listed above will r
"software channels. See Kbase article"
"for more details. "
"(http://kbase.redhat.com/faq/docs/DOC-11313)")
-CHANNELS_HOSTED_WARNING = _("Warning: Only installed products listed above "
- "will receive updates and support. If you would "
- "like to receive updates for additional products, "
- "please visit http://access.redhat.com/ "
- "and subscribe this system to the appropriate "
- "software channels. See Kbase article "
- "for more details. "
- "(http://kbase.redhat.com/faq/docs/DOC-11313)")
YUM_PLUGIN_WARNING = _("Warning: yum-rhn-plugin is not present, could not enable it.\n"
"Automatic updates will not work.")
YUM_PLUGIN_CONF_CHANGED = _("Note: yum-rhn-plugin has been enabled.")
@@ -190,20 +177,15 @@ FAILED_CHANNELS = _("You were unable to be subscribed to the following "
"subscriptions available in your account:")
NO_BASE_CHANNEL = _(
"This system was unable to subscribe to any software channels. Your system "
-"will not receive any software updates to keep it secure and supported. There "
-"are a few things you can try to resolve this situation:\n(1) Log in to "
-"http://rhn.redhat.com/ and unentitle an inactive system at "
-"Your RHN > Subscription Management > System Entitlements.\n"
-"(2) Purchase an additional Red Hat Enterprise Linux subscription at "
-"http://www.redhat.com/store/.\n(3) Activate a new "
-"installation number at http://www.redhat.com/now/. Once you make the "
+"will not receive any software updates to keep it secure and supported. "
+"Contact your Satellite administrator about this problem. Once you make the "
"appropriate active subscriptions available in your account, you may browse "
"to this system's profile in the RHN web interface and subscribe this system "
"to software channels via the software > software channels tab.")
-SLOTS_TITLE = _("RHN Classic Service Level:")
-OK_SLOTS = _("Depending on what RHN Classic modules are associated with a system, you'll "
+SLOTS_TITLE = _("Service Level:")
+OK_SLOTS = _("Depending on what RHN Satellite modules are associated with a system, you'll "
"enjoy different benefits. The following are the "
- "RHN Classic modules associated with this system:")
+ "RHN Satellite modules associated with this system:")
SLOTS = SLOTS_TITLE + "\n" + OK_SLOTS + "\n%s"
FAILED_SLOTS = _("This system was unable to be associated with the "
"following RHN module(s) because there were "
@@ -214,7 +196,7 @@ MANAGEMENT = _("Management module: automatic updates, systems "
"grouping, systems permissions, system package profiling")
PROVISIONING = _("Provisioning module: bare-metal provisioning, existing state provisioning, "
"rollbacks, configuration management")
-MONITORING = _("Monitoring module: pre-defined and custom system "
+MONITORING = _("Monitoring module: pre-defined and custom system "
"performance probes, system performance email "
"notifications, graphs of system performance")
@@ -235,23 +217,18 @@ VIRT_FAILED = _("<b>Warning:</b> Any guest systems you create on this system "
NO_SYS_ENTITLEMENT = _("This system was unable to be associated with "
"any RHN service level modules. This system will not receive any software "
-"updates to keep it secure and supported. There "
-"are a few things you can try to resolve this situation:\n(1) Log in to "
-"http://rhn.redhat.com/ and unentitle an inactive system at "
-"Your RHN > Subscription Management > System Entitlements.\n"
-"(2) Purchase an additional Red Hat Enterprise Linux subscription at "
-"http://www.redhat.com/store/.\n(3) Activate a new "
-"installation number at http://www.redhat.com/now/. Once you make the "
+"updates to keep it secure and supported. Contace your Satellite administrator "
+"about this problem. Once you make the "
"appropriate active subscriptions available in your account, you may browse "
"to this system's profile in the RHN web interface, delete the profile, and "
"re-connect this system to Red Hat Network.")
ACTIVATION_KEY = _("Universal default activation key detected\n"
- "A universal default activation key was detected in your RHN Classic account. "
- "This means that a set of properties (software channel subscriptions, "
+ "A universal default activation key was detected in your account. "
+ "This means that a set of properties (software channel subscriptions, "
"package installations, system group memberships, etc.) "
- "for your system's connection to RHN Classic "
+ "for your system's connection to RHN Satellite or RHN Proxy"
"have been determined by the activation key rather than your "
- "installation number. "
+ "installation number. "
"You may also refer to the RHN Reference Guide, section 6.4.6 for more details "
"about activation keys (http://access.redhat.com/knowledge/docs/Red_Hat_Network/)\n"
"Universal Default activation key: %s")
@@ -278,7 +255,7 @@ SSL_CERT_ERROR_MSG = _("<b><span size=\"16000\">Incompatible Certificate
"The certificate you provided, <b>%s</b>, is not compatible with "
" the Red Hat Network server at <b>%s</b>. You may want to double-check"
" that you have provided a valid certificate file."
- " Are you sure you have provided the correct certificate, and that"
+ " Are you sure you have provided the correct certificate, and that"
" the certificate file has not been corrupted?\n\n"
"Please try again with a different certificate file.")
@@ -309,7 +286,7 @@ CHANNEL_PAGE_WARNING = _("Warning:You will not be able to limit this"
" system to minor release that is older than"
" the recent minor release if you select this"
" option.\n")
-
+
CONFIRM_OS_WARNING = _("Your system will be subscribed to %s \n"
"base software channel. You will not be\n"
"able to move this system to an earlier release\n"
diff --git a/client/rhel/rhn-client-tools/src/up2date_client/tui.py b/client/rhel/rhn-client-tools/src/up2date_client/tui.py
index 867c9b6..946b939 100644
--- a/client/rhel/rhn-client-tools/src/up2date_client/tui.py
+++ b/client/rhel/rhn-client-tools/src/up2date_client/tui.py
@@ -52,7 +52,7 @@ def WarningWindow(screen, errmsg):
[OK.encode('utf-8')])
screen.finish()
-
+
def ConfirmQuitWindow(screen):
button = snack.ButtonChoiceWindow(screen, CONFIRM_QUIT.encode('utf-8'),
CONFIRM_QUIT_SURE.encode('utf-8') + "\n" + \
@@ -74,8 +74,8 @@ def ConfirmQuitWindow(screen):
return 1
else:
return 0
-
-
+
+
def tui_call_wrapper(screen, func, *params):
try:
@@ -85,14 +85,14 @@ def tui_call_wrapper(screen, func, *params):
except up2dateErrors.SSLCertificateVerifyFailedError, e:
FatalErrorWindow(screen, e.errmsg)
except up2dateErrors.NoBaseChannelError, e:
- FatalErrorWindow(screen, e.errmsg + '\n' +
- BASECHANNELERROR % (up2dateUtils.getArch(),
+ FatalErrorWindow(screen, e.errmsg + '\n' +
+ BASECHANNELERROR % (up2dateUtils.getArch(),
up2dateUtils.getOSRelease(),
up2dateUtils.getVersion()))
except up2dateErrors.SSLCertificateFileNotFound, e:
FatalErrorWindow(screen, e.errmsg + '\n\n' +
SSL_CERT_FILE_NOT_FOUND_ERRER)
-
+
return results
class WindowSkipException:
@@ -206,7 +206,7 @@ class ConnectWindow:
config.setServerURL(self.server)
cfg.save()
-
+
self.proxy = cfg['httpProxy']
toplevel = snack.GridForm(self.screen, CONNECT_WINDOW.encode('utf-8'), 1, 1)
@@ -216,11 +216,11 @@ class ConnectWindow:
if self.proxy:
text += CONNECT_WINDOW_TEXT2 % self.proxy
- tb = snack.Textbox(size[0]-30, size[1]-20,
+ tb = snack.Textbox(size[0]-30, size[1]-20,
text.encode('utf-8'),
1, 1)
- toplevel.add(tb, 0, 0, padding = (0, 0, 0, 1))
+ toplevel.add(tb, 0, 0, padding = (0, 0, 0, 1))
self.g = toplevel
@@ -234,7 +234,7 @@ class ConnectWindow:
result = self.g.draw()
self.screen.refresh()
tui_call_wrapper(self.screen, rhnreg.getCaps)
-
+
self.screen.popWindow()
# Just return next, although the user wouldn't have actually pressed
@@ -243,9 +243,9 @@ class ConnectWindow:
def saveResults(self):
pass
-
+
class StartWindow:
-
+
def __init__(self, screen, tui):
self.name = "StartWindow"
self.screen = screen
@@ -324,7 +324,7 @@ class WhyRegisterWindow:
button = self.bb.buttonPressed(result)
return button
-
+
class InfoWindow:
@@ -335,27 +335,18 @@ class InfoWindow:
self.tui.alreadyRegistered = 0
self.server = self.tui.serverURL
-
+
size = snack._snack.size()
toplevel = snack.GridForm(screen, REGISTER_WINDOW.encode('utf-8'), 1, 4)
- # Satellite
- if self.tui.serverType == 'satellite':
- decoded_server = convert_url_from_pune(self.server)
- url = self.server
- if decoded_server != self.server:
- url += " (%s)" % decoded_server
- login_prompt = LOGIN_PROMPT % url
- login_label = LOGIN
- login_tip = LOGIN_TIP
-
- # Hosted
- else:
- login_prompt = HOSTED_LOGIN_PROMPT
- login_label = HOSTED_LOGIN
- login_tip = HOSTED_LOGIN_TIP
-
+ decoded_server = convert_url_from_pune(self.server)
+ url = self.server
+ if decoded_server != self.server:
+ url += " (%s)" % decoded_server
+ login_prompt = LOGIN_PROMPT % url
+ login_label = LOGIN
+ login_tip = LOGIN_TIP
label = snack.Textbox(size[0]-10, 3,
login_prompt.encode('utf-8'),
@@ -431,7 +422,7 @@ class InfoWindow:
def saveResults(self):
self.tui.userName = self.userNameEntry.value()
self.tui.password = self.passwordEntry.value()
-
+
def run(self):
log.log_debug("Running %s" % self.__class__.__name__)
self.screen.refresh()
@@ -451,21 +442,12 @@ class InfoWindow:
self.screen.popWindow()
return button
-
+
class OSReleaseWindow:
def __init__(self, screen, tui):
self.tui = tui
- # As OSReleaseWindow seems to be the next window which gets tried
- # after InfoWindow has verified the login and password, we
- # can try to activate the hardware asset code here, before
- # available_eus_channels gets called.
- if self.tui.serverType == 'hosted':
- hw_activation_code = rhnreg._activate_hardware(self.tui.userName, self.tui.password)
- if hw_activation_code != None:
- self.tui.other['registration_number'] = hw_activation_code
-
if not rhnreg.server_supports_eus():
log.log_debug("Server does not support EUS, skipping OSReleaseWindow")
raise WindowSkipException()
@@ -478,10 +460,10 @@ class OSReleaseWindow:
self.name = "OSReleaseWindow"
self.screen = screen
- self.size = snack._snack.size()
+ self.size = snack._snack.size()
self.selectChannel = False
-
+
toplevel = snack.GridForm(self.screen, SELECT_OSRELEASE.encode('utf-8'), 1, 7)
self.g = toplevel
@@ -502,7 +484,7 @@ class OSReleaseWindow:
self.sublabel = snack.Label(MINOR_RELEASE.encode('utf-8'))
toplevel.add(self.sublabel, 0, 2, anchorLeft = 1)
- self.channelList = snack.Listbox(self.size[1]-22, 1,
+ self.channelList = snack.Listbox(self.size[1]-22, 1,
width = self.size[0]-10)
toplevel.add(self.channelList, 0, 3)
@@ -517,16 +499,16 @@ class OSReleaseWindow:
optiontext2 = ALL_UPDATES.encode('utf-8')
if self.tui.all_updates_button:
- self.all_updates_button = snack.SingleRadioButton(optiontext2,
+ self.all_updates_button = snack.SingleRadioButton(optiontext2,
self.limited_updates_button, isOn=1)
else:
- self.all_updates_button = snack.SingleRadioButton(optiontext2,
+ self.all_updates_button = snack.SingleRadioButton(optiontext2,
self.limited_updates_button)
-
+
toplevel.add(self.all_updates_button, 0, 5, padding = (0, 0, 0, 1),
anchorLeft = 1)
- #self.warning = snack.TextboxReflowed(self.size[0]-10,
+ #self.warning = snack.TextboxReflowed(self.size[0]-10,
# CHANNEL_PAGE_WARNING.encode('utf-8'))
#toplevel.add(self.warning, 0, 9, anchorLeft = 1)
@@ -539,7 +521,7 @@ class OSReleaseWindow:
self.screen.refresh()
-
+
def run(self):
log.log_debug("Running %s" % self.__class__.__name__)
@@ -566,7 +548,7 @@ class OSReleaseWindow:
if self.limited_updates_button.selected():
later_release = self.channelList.current() != \
self.available_channels['default_channel']
-
+
title = CONFIRM_OS_RELEASE_SELECTION.encode('utf-8')
if later_release:
msgbox = snack.ButtonChoiceWindow(self.screen, title,
@@ -615,7 +597,7 @@ class HardwareWindow:
# read all hardware in
tui.hardware = hardware.Hardware()
-
+
toplevel = snack.GridForm(screen, HARDWARE_WINDOW.encode('utf-8'), 1, 7)
text = snack.TextboxReflowed(70, HARDWARE_WINDOW_DESC1.encode('utf-8'))
@@ -631,12 +613,12 @@ class HardwareWindow:
grid.setField(self.profileEntry, 1, 0, anchorLeft = 1)
toplevel.add(grid, 0, 1, anchorLeft = 1)
-
+
if tui.includeHardware:
self.hardwareButton = snack.Checkbox(HARDWARE_WINDOW_CHECKBOX.encode('utf-8'), isOn = 1)
else:
self.hardwareButton = snack.Checkbox(HARDWARE_WINDOW_CHECKBOX.encode('utf-8'))
-
+
toplevel.add(self.hardwareButton, 0, 2, padding = (0, 1, 0, 0),
anchorLeft = 1)
@@ -655,10 +637,10 @@ class HardwareWindow:
hardware_text += _("CPU model: ")
- for hw in tui.hardware:
+ for hw in tui.hardware:
if hw['class'] == 'CPU':
hardware_text += hw['model'] +"\n"
-
+
hardware_text += _("Hostname: ")
for hw in tui.hardware:
@@ -673,7 +655,7 @@ class HardwareWindow:
hardware_text += _("CPU speed: ")
- for hw in tui.hardware:
+ for hw in tui.hardware:
if hw['class'] == 'CPU':
hardware_text += _("%d MHz") % hw['speed'] + " "
@@ -699,7 +681,7 @@ class HardwareWindow:
toplevel.add(self.additionalHWLabel, 0, 5, padding = (0, 1, 0, 0),
anchorLeft = 1)
-
+
# BUTTON BAR
self.bb = snack.ButtonBar(screen,
[(NEXT.encode('utf-8'), "next"),
@@ -771,7 +753,7 @@ class PackagesWindow:
package['release']),
item = package['name'],
selected = 1)
-
+
# BUTTON BAR
self.bb = snack.ButtonBar(screen,
[(NEXT.encode('utf-8'), "next"),
@@ -786,7 +768,7 @@ class PackagesWindow:
self.scale.set(int(((amount * 1.0)/ total) * 100))
self.pwin.draw()
self.screen.refresh()
-
+
def saveResults(self):
self.tui.includePackages = self.packagesButton.selected()
@@ -795,7 +777,7 @@ class PackagesWindow:
if pkg['name'] in selection:
self.tui.selectedPackages.append(pkg)
-
+
def run(self):
log.log_debug("Running %s" % self.__class__.__name__)
result = self.g.runOnce()
@@ -812,7 +794,7 @@ class SendWindow:
self.tui = tui
self.name = "SendWindow"
size = snack._snack.size()
-
+
toplevel = snack.GridForm(screen, SEND_WINDOW.encode('utf-8'), 1, 2)
text = snack.TextboxReflowed(size[0]-15, SEND_WINDOW_DESC.encode('utf-8'))
@@ -862,25 +844,25 @@ class SendingWindow:
reg_info = None
try:
- # reg_info dict contains: 'system_id', 'channels',
+ # reg_info dict contains: 'system_id', 'channels',
# 'failed_channels', 'slots', 'failed_slots'
log.log_debug('other is %s' % str(self.tui.other))
reg_info = rhnreg.registerSystem2(self.tui.userName, self.tui.password,
- self.tui.profileName,
+ self.tui.profileName,
other = self.tui.other)
reg_info = reg_info.rawDict
-
+
if isinstance(reg_info['system_id'], unicode):
systemId = unicode.encode(reg_info['system_id'], 'utf-8')
else:
systemId = reg_info['system_id']
-
+
except up2dateErrors.CommunicationError, e:
- FatalErrorWindow(self.screen,
+ FatalErrorWindow(self.screen,
_("Problem registering system:\n") + e.errmsg)
except up2dateErrors.RhnUuidUniquenessError, e:
- FatalErrorWindow(self.screen,
+ FatalErrorWindow(self.screen,
_("Problem registering system:\n") + e.errmsg)
except up2dateErrors.InsuffMgmntEntsError, e:
FatalErrorWindow(self.screen,
@@ -894,14 +876,14 @@ class SendingWindow:
# write the system id out.
if not rhnreg.writeSystemId(systemId):
- FatalErrorWindow(self.screen,
+ FatalErrorWindow(self.screen,
_("Problem writing out system id to disk."))
self.setScale(1, 4)
# include the info from the oeminfo file as well
self.oemInfo = rhnreg.getOemInfo()
-
+
self.setScale(2, 4)
# maybe upload hardware profile
@@ -1006,7 +988,7 @@ class ReviewWindow:
self.tui = tui
self.reg_info = tui.reg_info
size = snack._snack.size()
-
+
toplevel = snack.GridForm(screen, REVIEW_WINDOW.encode('utf-8'), 1, 2)
review_window_text = ''
@@ -1029,18 +1011,13 @@ class ReviewWindow:
channels = CHANNELS_TITLE + "\n" + \
OK_CHANNELS + "\n" + \
- "%s\n"
+ "%s\n"
- # If it's hosted, reference the hosted url,
- # otherwise, we don't know the url for their sat.
log.log_debug("server type is %s " % self.tui.serverType)
- if self.tui.serverType == 'hosted':
- channels += CHANNELS_HOSTED_WARNING
- else:
- channels += CHANNELS_SAT_WARNING
+ channels += CHANNELS_SAT_WARNING
review_window_text += channels % channel_list + "\n\n"
-
+
if len(self.reg_info['system_slots']) > 0:
slot_list = ""
for slot in self.reg_info['system_slots']:
@@ -1059,17 +1036,17 @@ class ReviewWindow:
else:
slot_list += slot + "\n"
review_window_text += SLOTS % slot_list + "\n\n"
-
+
if len(self.reg_info['universal_activation_key']) > 0:
act_key_list = ""
for act_key in self.reg_info['universal_activation_key']:
act_key_list += act_key
review_window_text += ACTIVATION_KEY % (act_key_list)
-
+
self.review_window = snack.Textbox(size[0]-10, size[1]-14, review_window_text.encode('utf-8'), 1, 1)
-
+
toplevel.add(self.review_window, 0, 0, padding = (0, 1, 0, 0))
-
+
# BUTTON BAR
self.bb = snack.ButtonBar(screen, [(OK.encode('utf-8'), "next")])
toplevel.add(self.bb, 0, 1, padding = (0, 1, 0, 0),
@@ -1091,9 +1068,9 @@ class ReviewWindow:
button = "exit"
if self.tui.yum_plugin_conf_error:
button = "exit"
-
- return button
-
+
+ return button
+
class Tui:
def __init__(self, screen, test):
@@ -1123,15 +1100,10 @@ class Tui:
FinishWindow
]
self.serverURL = config.getServerlURL()[0]
-
+
if not cfg['sslCACert']:
- # Always use the path from the cert if available, else set to
- # default location
- if self.serverType == "hosted":
- cfg.set('sslCACert', '/usr/share/rhn/RHNS-CA-CERT')
- else:
- cfg.set('sslCACert', '/usr/share/rhn/RHN-ORG-TRUSTED-SSL-CERT')
-
+ cfg.set('sslCACert', '/usr/share/rhn/RHN-ORG-TRUSTED-SSL-CERT')
+
def __del__(self):
self.screen.finish()
@@ -1160,12 +1132,12 @@ class Tui:
"country" : "",
}
- self.other = {}
+ self.other = {}
self.other['registration_number'] = ''
-
+
self.profileName = ""
self.includeHardware = 1
-
+
self.limited_updates_button = 1
self.all_updates_button = 0
self.includePackages = 0
@@ -1178,7 +1150,7 @@ class Tui:
def run(self):
log.log_debug("Running %s" % self.__class__.__name__)
self.initResults()
-
+
direction = "forward"
try:
@@ -1196,7 +1168,7 @@ class Tui:
continue
log.log_debug("index is %s" % index)
-
+
result = win.run()
log.log_debug("Result %s" % result)
@@ -1211,11 +1183,11 @@ class Tui:
elif result == "cancel":
log.log_debug("Caught a cancel request")
-
+
# Show the confirm quit window
if ConfirmQuitWindow(self.screen) == 1:
return
-
+
elif result == "next":
index = index + 1
win.saveResults()
@@ -1224,9 +1196,9 @@ class Tui:
finally:
self.screen.finish()
-
+
def main():
- test = 0
+ test = 0
signal.signal(signal.SIGINT, signal.SIG_IGN)
if len(sys.argv) > 1:
@@ -1241,6 +1213,6 @@ def main():
tui = Tui(screen, test)
tui.run()
-
+
if __name__ == "__main__":
main()
11 years, 7 months
Changes to 'refs/tags/spacewalk-branding-1.8.7-1'
by Jan Pazdziora
Tag 'spacewalk-branding-1.8.7-1' created by Jan Pazdziora <jpazdziora(a)redhat.com> at 2012-10-24 16:14 +0000
Tagging package [spacewalk-branding] version [1.8.7-1] in directory [branding/].
Changes since spacewalk-backend-1.8.82-1:
Jan Pazdziora (1):
Automatic commit of package [spacewalk-branding] release [1.8.7-1].
---
branding/spacewalk-branding.spec | 5 ++++-
rel-eng/packages/spacewalk-branding | 2 +-
2 files changed, 5 insertions(+), 2 deletions(-)
---
11 years, 7 months
Changes to 'refs/tags/spacewalk-backend-1.8.82-1'
by Jan Pazdziora
Tag 'spacewalk-backend-1.8.82-1' created by Jan Pazdziora <jpazdziora(a)redhat.com> at 2012-10-24 16:14 +0000
Tagging package [spacewalk-backend] version [1.8.82-1] in directory [backend/].
Changes since spacewalk-java-1.8.169-1:
Jan Pazdziora (1):
Automatic commit of package [spacewalk-backend] release [1.8.82-1].
---
backend/spacewalk-backend.spec | 5 ++++-
rel-eng/packages/spacewalk-backend | 2 +-
2 files changed, 5 insertions(+), 2 deletions(-)
---
11 years, 7 months
2 commits - backend/spacewalk-backend.spec branding/spacewalk-branding.spec rel-eng/packages
by Jan Pazdziora
backend/spacewalk-backend.spec | 5 ++++-
branding/spacewalk-branding.spec | 5 ++++-
rel-eng/packages/spacewalk-backend | 2 +-
rel-eng/packages/spacewalk-branding | 2 +-
4 files changed, 10 insertions(+), 4 deletions(-)
New commits:
commit 42633a0a916bf3fa2ddd0e210186485388e6e8e5
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Wed Oct 24 18:14:51 2012 +0200
Automatic commit of package [spacewalk-branding] release [1.8.7-1].
diff --git a/branding/spacewalk-branding.spec b/branding/spacewalk-branding.spec
index eb93cd4..781651e 100644
--- a/branding/spacewalk-branding.spec
+++ b/branding/spacewalk-branding.spec
@@ -1,5 +1,5 @@
Name: spacewalk-branding
-Version: 1.8.6
+Version: 1.8.7
Release: 1%{?dist}
Summary: Spacewalk branding data
@@ -82,6 +82,9 @@ rm -rf %{buildroot}
%doc LICENSE
%changelog
+* Wed Oct 24 2012 Jan Pazdziora 1.8.7-1
+- WebUI - css for @media print
+
* Tue Oct 23 2012 Tomas Lestach <tlestach(a)redhat.com> 1.8.6-1
- make the white image background transparent
- Expose extra packages / systems with extra packages
diff --git a/rel-eng/packages/spacewalk-branding b/rel-eng/packages/spacewalk-branding
index 2455a2c..19a26ca 100644
--- a/rel-eng/packages/spacewalk-branding
+++ b/rel-eng/packages/spacewalk-branding
@@ -1 +1 @@
-1.8.6-1 branding/
+1.8.7-1 branding/
commit fcab2c22579b47c1aeb9570d2e89aa1cfefb9564
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Wed Oct 24 18:14:45 2012 +0200
Automatic commit of package [spacewalk-backend] release [1.8.82-1].
diff --git a/backend/spacewalk-backend.spec b/backend/spacewalk-backend.spec
index f54a9ca..8125a27 100644
--- a/backend/spacewalk-backend.spec
+++ b/backend/spacewalk-backend.spec
@@ -12,7 +12,7 @@ Name: spacewalk-backend
Summary: Common programs needed to be installed on the Spacewalk servers/proxies
Group: Applications/Internet
License: GPLv2
-Version: 1.8.81
+Version: 1.8.82
Release: 1%{?dist}
URL: https://fedorahosted.org/spacewalk
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
@@ -638,6 +638,9 @@ rm -f %{rhnconf}/rhnSecret.py*
# $Id$
%changelog
+* Wed Oct 24 2012 Jan Pazdziora 1.8.82-1
+- group file might be missing
+
* Mon Oct 22 2012 Jan Pazdziora 1.8.81-1
- 828804 - no su-ing to oracle with embedded PostgreSQL.
- rhnlib >= 2.5.38 is not necessary
diff --git a/rel-eng/packages/spacewalk-backend b/rel-eng/packages/spacewalk-backend
index a5ce400..4bf315c 100644
--- a/rel-eng/packages/spacewalk-backend
+++ b/rel-eng/packages/spacewalk-backend
@@ -1 +1 @@
-1.8.81-1 backend/
+1.8.82-1 backend/
11 years, 7 months
Changes to 'refs/tags/spacewalk-java-1.8.169-1'
by StephenHerr
Tag 'spacewalk-java-1.8.169-1' created by Stephen Herr <sherr(a)redhat.com> at 2012-10-24 14:01 +0000
Tagging package [spacewalk-java] version [1.8.169-1] in directory [java/].
Changes since spacewalk-pylint-0.8-1:
Michael Mraka (1):
group file might be missing
Stephen Herr (2):
fixing problems in 9d2ad9da4305d41d1d43666b2685eed2136c2f16
Automatic commit of package [spacewalk-java] release [1.8.169-1].
Tomas Kasparek (1):
WebUI - css for @media print
---
backend/satellite_tools/repo_plugins/yum_src.py | 7 +
branding/css/rhn-basic.css | 30 ++++++
java/code/src/com/redhat/rhn/domain/server/Server.java | 10 +-
java/code/src/com/redhat/rhn/frontend/xmlrpc/system/SystemHandler.java | 49 +++++-----
java/code/src/com/redhat/rhn/frontend/xmlrpc/system/test/SystemHandlerTest.java | 3
java/code/src/com/redhat/rhn/manager/system/SystemManager.java | 3
java/code/webapp/WEB-INF/includes/header.jsp | 19 +++
java/spacewalk-java.spec | 6 +
rel-eng/packages/spacewalk-java | 2
9 files changed, 97 insertions(+), 32 deletions(-)
---
11 years, 7 months
java/spacewalk-java.spec rel-eng/packages
by StephenHerr
java/spacewalk-java.spec | 6 +++++-
rel-eng/packages/spacewalk-java | 2 +-
2 files changed, 6 insertions(+), 2 deletions(-)
New commits:
commit c54b99b2182cb54977869e04f90935e05ba28e83
Author: Stephen Herr <sherr(a)redhat.com>
Date: Wed Oct 24 10:01:38 2012 -0400
Automatic commit of package [spacewalk-java] release [1.8.169-1].
diff --git a/java/spacewalk-java.spec b/java/spacewalk-java.spec
index ae6fde0..e43df28 100644
--- a/java/spacewalk-java.spec
+++ b/java/spacewalk-java.spec
@@ -23,7 +23,7 @@ Name: spacewalk-java
Summary: Spacewalk Java site packages
Group: Applications/Internet
License: GPLv2
-Version: 1.8.168
+Version: 1.8.169
Release: 1%{?dist}
URL: https://fedorahosted.org/spacewalk
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
@@ -616,6 +616,10 @@ fi
%{jardir}/postgresql-jdbc.jar
%changelog
+* Wed Oct 24 2012 Stephen Herr <sherr(a)redhat.com> 1.8.169-1
+- fixing problems in 9d2ad9da4305d41d1d43666b2685eed2136c2f16
+- WebUI - css for @media print
+
* Tue Oct 23 2012 Stephen Herr <sherr(a)redhat.com> 1.8.168-1
- 869428 - Added new API method for Splice integration
- Fixing a bunch of Generics type errors
diff --git a/rel-eng/packages/spacewalk-java b/rel-eng/packages/spacewalk-java
index 3e65a30..61679a9 100644
--- a/rel-eng/packages/spacewalk-java
+++ b/rel-eng/packages/spacewalk-java
@@ -1 +1 @@
-1.8.168-1 java/
+1.8.169-1 java/
11 years, 7 months
java/code
by StephenHerr
java/code/src/com/redhat/rhn/domain/server/Server.java | 10 +-
java/code/src/com/redhat/rhn/frontend/xmlrpc/system/SystemHandler.java | 49 +++++-----
java/code/src/com/redhat/rhn/frontend/xmlrpc/system/test/SystemHandlerTest.java | 3
java/code/src/com/redhat/rhn/manager/system/SystemManager.java | 3
4 files changed, 37 insertions(+), 28 deletions(-)
New commits:
commit 44d950a6b0fe0a93529c7a23ea1deaed19f693ea
Author: Stephen Herr <sherr(a)redhat.com>
Date: Wed Oct 24 08:41:05 2012 -0400
fixing problems in 9d2ad9da4305d41d1d43666b2685eed2136c2f16
diff --git a/java/code/src/com/redhat/rhn/domain/server/Server.java b/java/code/src/com/redhat/rhn/domain/server/Server.java
index 035428e..65c5ffe 100644
--- a/java/code/src/com/redhat/rhn/domain/server/Server.java
+++ b/java/code/src/com/redhat/rhn/domain/server/Server.java
@@ -29,7 +29,6 @@ import com.redhat.rhn.domain.entitlement.VirtualizationEntitlement;
import com.redhat.rhn.domain.org.CustomDataKey;
import com.redhat.rhn.domain.org.Org;
import com.redhat.rhn.domain.org.OrgFactory;
-import com.redhat.rhn.domain.rhnpackage.Package;
import com.redhat.rhn.domain.user.User;
import com.redhat.rhn.manager.configuration.ConfigurationManager;
import com.redhat.rhn.manager.entitlement.EntitlementManager;
@@ -107,9 +106,10 @@ public class Server extends BaseDomainHelper implements Identifiable {
private Set<VirtualInstance> guests = new HashSet<VirtualInstance>();
private VirtualInstance virtualInstance;
private PushClient pushClient;
- private final ConfigChannelListProcessor configListProc = new ConfigChannelListProcessor();
+ private final ConfigChannelListProcessor configListProc =
+ new ConfigChannelListProcessor();
private Set<ServerHistoryEvent> history;
- private Set<Package> packages;
+ private Set<InstalledPackage> packages;
private ProxyInfo proxyInfo;
private Set<? extends ServerGroup> groups;
private Set<Capability> capabilities;
@@ -1797,7 +1797,7 @@ public class Server extends BaseDomainHelper implements Identifiable {
/**
* @return Returns the packages.
*/
- public Set<Package> getPackages() {
+ public Set<InstalledPackage> getPackages() {
return packages;
}
@@ -1805,7 +1805,7 @@ public class Server extends BaseDomainHelper implements Identifiable {
/**
* @param packagesIn The packages to set.
*/
- public void setPackages(Set<Package> packagesIn) {
+ public void setPackages(Set<InstalledPackage> packagesIn) {
this.packages = packagesIn;
}
diff --git a/java/code/src/com/redhat/rhn/frontend/xmlrpc/system/SystemHandler.java b/java/code/src/com/redhat/rhn/frontend/xmlrpc/system/SystemHandler.java
index e01e796..2677bc0 100644
--- a/java/code/src/com/redhat/rhn/frontend/xmlrpc/system/SystemHandler.java
+++ b/java/code/src/com/redhat/rhn/frontend/xmlrpc/system/SystemHandler.java
@@ -60,6 +60,7 @@ import com.redhat.rhn.domain.server.CPU;
import com.redhat.rhn.domain.server.CustomDataValue;
import com.redhat.rhn.domain.server.Device;
import com.redhat.rhn.domain.server.Dmi;
+import com.redhat.rhn.domain.server.InstalledPackage;
import com.redhat.rhn.domain.server.Location;
import com.redhat.rhn.domain.server.ManagedServerGroup;
import com.redhat.rhn.domain.server.NetworkInterface;
@@ -621,7 +622,8 @@ public class SystemHandler extends BaseHandler {
* @throws FaultException A FaultException is thrown if the user cannot
* be found from the session key
*
- * @xmlrpc.doc Given a list of server ids, returns a list of active servers' details visible to the user.
+ * @xmlrpc.doc Given a list of server ids, returns a list of active servers'
+ * details visible to the user.
* @xmlrpc.param #param("string", "sessionKey")
* @xmlrpc.param #array_single("int", "serverIds")
* @xmlrpc.returntype
@@ -629,7 +631,8 @@ public class SystemHandler extends BaseHandler {
* #struct("server details")
* #prop_desc("int", "id", "The server's id")
* #prop_desc("string", "name", "The server's name")
- * #prop_desc("dateTime.iso8601", "last_checkin", "Last time server successfully checked in ")
+ * #prop_desc("dateTime.iso8601", "last_checkin",
+ * "Last time server successfully checked in ")
* #prop_desc("int", "ram", "The amount of physical memory in MB.")
* #prop_desc("int", "swap", "The amount of swap space in MB.")
* #prop_desc("struct", "network_devices", "The server's network devices")
@@ -645,7 +648,8 @@ public class SystemHandler extends BaseHandler {
* #prop_desc("string", "channel_label", "The channel label.")
* #struct_end()
* #array_end()
- * #prop_desc("array", "active_guest_system_ids", "List of virtual guest system ids for active guests")
+ * #prop_desc("array", "active_guest_system_ids",
+ * "List of virtual guest system ids for active guests")
* #array()
* #prop_desc("int", "guest_id", "The guest's system id.")
* #array_end()
@@ -703,7 +707,8 @@ public class SystemHandler extends BaseHandler {
return ret;
}
- private Map<String, Object> createChannelMap(EssentialChannelDto channel, Boolean currentBase) {
+ private Map<String, Object> createChannelMap(EssentialChannelDto channel,
+ Boolean currentBase) {
Map<String, Object> ret = new HashMap<String, Object>();
ret.put("id", channel.getId());
@@ -1175,8 +1180,8 @@ public class SystemHandler extends BaseHandler {
* #struct_end()
* #array_end()
*/
- public List<Map<String, Object>> listLatestAvailablePackage(String sessionKey, List<Integer> systemIds,
- String name) throws FaultException {
+ public List<Map<String, Object>> listLatestAvailablePackage(String sessionKey,
+ List<Integer> systemIds, String name) throws FaultException {
// Get the logged in user
User loggedInUser = getLoggedInUser(sessionKey);
@@ -1771,7 +1776,8 @@ public class SystemHandler extends BaseHandler {
* #prop("string", "custom info label")
* #struct_end()
*/
- public Map<String, String> getCustomValues(String sessionKey, Integer sid) throws FaultException {
+ public Map<String, String> getCustomValues(String sessionKey, Integer sid)
+ throws FaultException {
// Get the logged in user and server
User loggedInUser = getLoggedInUser(sessionKey);
Server server = lookupServer(loggedInUser, sid);
@@ -2841,8 +2847,8 @@ public class SystemHandler extends BaseHandler {
* @xmlrpc.param dateTime.iso8601 earliestOccurrence
* @xmlrpc.returntype #return_int_success()
*/
- public int scheduleApplyErrata(String sessionKey, List<Integer> serverIds, List<Integer> errataIds,
- Date earliestOccurrence) {
+ public int scheduleApplyErrata(String sessionKey, List<Integer> serverIds,
+ List<Integer> errataIds, Date earliestOccurrence) {
// we need long values to pass to ErrataManager.applyErrataHelper
List<Long> longServerIds = new ArrayList<Long>();
@@ -3083,8 +3089,8 @@ public class SystemHandler extends BaseHandler {
* @xmlrpc.param dateTime.iso8601 earliestOccurrence
* @xmlrpc.returntype #return_int_success()
*/
- public int schedulePackageInstall(String sessionKey, Integer sid, List<Integer> packageIds,
- Date earliestOccurrence) {
+ public int schedulePackageInstall(String sessionKey, Integer sid,
+ List<Integer> packageIds, Date earliestOccurrence) {
User loggedInUser = getLoggedInUser(sessionKey);
Server server = SystemManager.lookupByIdAndUser(new Long(sid.longValue()),
loggedInUser);
@@ -3142,8 +3148,8 @@ public class SystemHandler extends BaseHandler {
* @xmlrpc.returntype int - ID of the action scheduled, otherwise exception thrown
* on error
*/
- public int schedulePackageRemove(String sessionKey, Integer sid, List<Integer> packageIds,
- Date earliestOccurrence) {
+ public int schedulePackageRemove(String sessionKey, Integer sid,
+ List<Integer> packageIds, Date earliestOccurrence) {
User loggedInUser = getLoggedInUser(sessionKey);
Server server = SystemManager.lookupByIdAndUser(new Long(sid.longValue()),
@@ -3244,11 +3250,11 @@ public class SystemHandler extends BaseHandler {
loggedInUser);
Set<Package> chanPacks = channel.getPackages();
- Set<Package> sysPacks = server.getPackages();
+ Set<InstalledPackage> sysPacks = server.getPackages();
Set<Package> intersection = new HashSet<Package>();
- for (Iterator<Package> it = sysPacks.iterator(); it.hasNext();) {
- Package insPack = it.next();
+ for (Iterator<InstalledPackage> it = sysPacks.iterator(); it.hasNext();) {
+ InstalledPackage insPack = it.next();
for (Iterator<Package> chanIt = chanPacks.iterator(); chanIt.hasNext();) {
Package chanPack = chanIt.next();
@@ -3343,8 +3349,9 @@ public class SystemHandler extends BaseHandler {
* @xmlrpc.returntype int - ID of the script run action created. Can be used to fetch
* results with system.getScriptResults.
*/
- public Integer scheduleScriptRun(String sessionKey, List<Integer> systemIds, String username,
- String groupname, Integer timeout, String script, Date earliest) {
+ public Integer scheduleScriptRun(String sessionKey, List<Integer> systemIds,
+ String username, String groupname, Integer timeout, String script,
+ Date earliest) {
User loggedInUser = getLoggedInUser(sessionKey);
@@ -3772,7 +3779,8 @@ public class SystemHandler extends BaseHandler {
* @xmlrpc.param #array_single("string", " entitlementLabel")
* @xmlrpc.returntype #return_int_success()
*/
- public int addEntitlements(String sessionKey, Integer serverId, List<String> entitlements) {
+ public int addEntitlements(String sessionKey, Integer serverId,
+ List<String> entitlements) {
boolean needsSnapshot = false;
User loggedInUser = getLoggedInUser(sessionKey);
Server server = null;
@@ -3859,7 +3867,8 @@ public class SystemHandler extends BaseHandler {
* @xmlrpc.param #array_single("string", "entitlement_label")
* @xmlrpc.returntype #return_int_success()
*/
- public int removeEntitlements(String sessionKey, Integer serverId, List<String> entitlements) {
+ public int removeEntitlements(String sessionKey, Integer serverId,
+ List<String> entitlements) {
boolean needsSnapshot = false;
User loggedInUser = getLoggedInUser(sessionKey);
Server server = null;
diff --git a/java/code/src/com/redhat/rhn/frontend/xmlrpc/system/test/SystemHandlerTest.java b/java/code/src/com/redhat/rhn/frontend/xmlrpc/system/test/SystemHandlerTest.java
index 2c29b24..5a6a21c 100644
--- a/java/code/src/com/redhat/rhn/frontend/xmlrpc/system/test/SystemHandlerTest.java
+++ b/java/code/src/com/redhat/rhn/frontend/xmlrpc/system/test/SystemHandlerTest.java
@@ -25,7 +25,6 @@ import com.redhat.rhn.domain.action.ActionFactory;
import com.redhat.rhn.domain.action.script.ScriptActionDetails;
import com.redhat.rhn.domain.action.script.ScriptResult;
import com.redhat.rhn.domain.action.script.ScriptRunAction;
-import com.redhat.rhn.domain.action.server.ServerAction;
import com.redhat.rhn.domain.action.virtualization.VirtualizationSetMemoryAction;
import com.redhat.rhn.domain.action.virtualization.VirtualizationSetVcpusAction;
import com.redhat.rhn.domain.channel.Channel;
@@ -823,7 +822,7 @@ public class SystemHandlerTest extends BaseHandlerTestCase {
public void testListAllEvents() throws Exception {
Server server = ServerFactoryTest.createTestServer(admin);
- List<ServerAction>results = handler.listSystemEvents(adminKey,
+ List<Map<String, Object>>results = handler.listSystemEvents(adminKey,
new Integer(server.getId().intValue()));
assertEquals(0, results.size());
diff --git a/java/code/src/com/redhat/rhn/manager/system/SystemManager.java b/java/code/src/com/redhat/rhn/manager/system/SystemManager.java
index d580613..96d8b65 100644
--- a/java/code/src/com/redhat/rhn/manager/system/SystemManager.java
+++ b/java/code/src/com/redhat/rhn/manager/system/SystemManager.java
@@ -2184,7 +2184,8 @@ public class SystemManager extends BaseManager {
currentGuestCpus.intValue()) {
result.addWarning(new ValidatorWarning(
"systems.details.virt.vcpu.increase.warning",
- new Object [] {new Integer(proposedVcpuSetting), guest.getName()}));
+ new Object [] {new Integer(proposedVcpuSetting),
+ guest.getName()}));
}
}
}
11 years, 7 months
branding/css java/code
by Tomáš Kašpárek
branding/css/rhn-basic.css | 30 +++++++++++++++++++++++++++
java/code/webapp/WEB-INF/includes/header.jsp | 19 ++++++++++++++++-
2 files changed, 48 insertions(+), 1 deletion(-)
New commits:
commit 15730b3b2a1e3dddb915781f91a5aaa1bce84c5e
Author: Tomas Kasparek <tkasparek(a)redhat.com>
Date: Wed Oct 24 11:23:16 2012 +0200
WebUI - css for @media print
Omiting of unneeded parts of page when printing (f.e. menu, search bar, etc.).
diff --git a/branding/css/rhn-basic.css b/branding/css/rhn-basic.css
index cd5a727..7f8127f 100644
--- a/branding/css/rhn-basic.css
+++ b/branding/css/rhn-basic.css
@@ -560,3 +560,33 @@ div.indent {
margin-right: auto;
margin-top: 64px;
}
+
+@media print {
+ .button { display: none; }
+ .content-nav-rowone, .content-nav-rowtwo, .contentnav-row2 { display: none; }
+ .csv-download { display: none; }
+ .list-sizeselector { display: none; }
+ .list-infotext { display: none; }
+ .list-alphabar-enabled, .list-alphabar-disabled {
+ display: none;
+}
+ .list-navbuttons { display: none; }
+ .toolbar { display: none; }
+ .toolbar-h1 img { display: none; }
+ #id { display: none; }
+ #geo { display: none; }
+ #linx { display: none; }
+ #mainNav { display: none; }
+ #utilityLinks { display: none; }
+ #header_selcount { display: none; }
+ #searchbar { display: none; }
+ INPUT[type="submit"] { display: none; }
+ td.sidebar { display: none; }
+ div#searchbarinner { display: none; }
+ body { background: white; }
+ #bar { display: none; }
+ #acc-logged-user-org-pipe { display: none; }
+ #acc-prefs { display: none; }
+ #acc-prefs-pipe { display: none; }
+ #acc-logout { display: none; }
+}
diff --git a/java/code/webapp/WEB-INF/includes/header.jsp b/java/code/webapp/WEB-INF/includes/header.jsp
index ace7d30..4135e50 100644
--- a/java/code/webapp/WEB-INF/includes/header.jsp
+++ b/java/code/webapp/WEB-INF/includes/header.jsp
@@ -19,7 +19,24 @@
</div>
<div id="utilityAccount">
<p>
- <span class="label"><bean:message key="header.jsp.loggedin"/></span> <a href="/rhn/account/UserDetails.do"><c:out escapeXml="true" value="${requestScope.session.user.login}" /></a><span class="navPipe">|</span><span class="label"><bean:message key="header.jsp.org"/></span> <a><c:out escapeXml="true" value="${requestScope.session.user.org.name}" /></a><span class="navPipe">|</span><a href="/rhn/account/UserPreferences.do"><bean:message key="header.jsp.preferences"/></a><span class="navPipe">|</span><html:link forward="logout"><span><bean:message key="header.jsp.signout"/></span></html:link>
+ <span id="acc-logged-user">
+ <span class="label"><bean:message key="header.jsp.loggedin"/></span> <a href="/rhn/account/UserDetails.do"><c:out escapeXml="true" value="${requestScope.session.user.login}" /></a>
+ </span>
+ <span class="navPipe" id="acc-logged-user-pipe">|</span>
+
+ <span id="acc-logged-user-org">
+ <span class="label"><bean:message key="header.jsp.org"/></span> <a><c:out escapeXml="true" value="${requestScope.session.user.org.name}" /></a>
+ </span>
+ <span class="navPipe" id="acc-logged-user-org-pipe">|</span>
+
+ <span id="acc-prefs">
+ <a href="/rhn/account/UserPreferences.do"><bean:message key="header.jsp.preferences"/></a>
+ </span>
+ <span class="navPipe" id="acc-prefs-pipe">|</span>
+
+ <span id="acc-logout">
+ <html:link forward="logout"><span><bean:message key="header.jsp.signout"/></span></html:link>
+ </span>
</p>
</div>
</div>
11 years, 7 months
backend/satellite_tools
by Michael Mraka
backend/satellite_tools/repo_plugins/yum_src.py | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
New commits:
commit 650612da4c031c65ef69a94daacbaf5ea3d6507c
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Wed Oct 24 11:09:03 2012 +0200
group file might be missing
fixing
ERROR: requested datatype group not available
Sync completed.
diff --git a/backend/satellite_tools/repo_plugins/yum_src.py b/backend/satellite_tools/repo_plugins/yum_src.py
index 8cd390b..19f0b75 100644
--- a/backend/satellite_tools/repo_plugins/yum_src.py
+++ b/backend/satellite_tools/repo_plugins/yum_src.py
@@ -21,6 +21,7 @@ import os.path
import yum
from spacewalk.common import fileutils
+from yum.Errors import RepoMDError
from yum.config import ConfigParser
from yum.update_md import UpdateMetadata, UpdateNoticeException, UpdateNotice
from yum.yumRepo import YumRepository
@@ -242,4 +243,8 @@ class ContentSource(object):
return um.notices
def get_groups(self):
- return self.repo.getGroups()
+ try:
+ groups = self.repo.getGroups()
+ except RepoMDError:
+ groups = None
+ return groups
11 years, 7 months
Changes to 'refs/tags/spacewalk-pylint-0.8-1'
by Michael Mraka
Tag 'spacewalk-pylint-0.8-1' created by Michael Mraka <michael.mraka(a)redhat.com> at 2012-10-24 07:27 +0000
Tagging package [spacewalk-pylint] version [0.8-1] in directory [spacewalk/pylint/].
Changes since spacewalk-java-1.8.168-1:
Michael Mraka (2):
Revert "put W1201 on list of ignored pylint warnings"
Automatic commit of package [spacewalk-pylint] release [0.8-1].
---
rel-eng/packages/spacewalk-pylint | 2 +-
spacewalk/pylint/spacewalk-pylint.rc | 3 +--
spacewalk/pylint/spacewalk-pylint.spec | 5 ++++-
3 files changed, 6 insertions(+), 4 deletions(-)
---
11 years, 7 months