client/rhel rel-eng/packages
by Jan Pazdziora
client/rhel/yum-rhn-plugin/yum-rhn-plugin.spec | 5 ++++-
rel-eng/packages/yum-rhn-plugin | 2 +-
2 files changed, 5 insertions(+), 2 deletions(-)
New commits:
commit d3e3d5d501c779e01fde4e439a2d20cb4361f92c
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Thu Mar 25 10:59:15 2010 +0100
Automatic commit of package [yum-rhn-plugin] release [0.9.2-1].
diff --git a/client/rhel/yum-rhn-plugin/yum-rhn-plugin.spec b/client/rhel/yum-rhn-plugin/yum-rhn-plugin.spec
index 33ad75d..108adf2 100644
--- a/client/rhel/yum-rhn-plugin/yum-rhn-plugin.spec
+++ b/client/rhel/yum-rhn-plugin/yum-rhn-plugin.spec
@@ -1,6 +1,6 @@
Summary: RHN support for yum
Name: yum-rhn-plugin
-Version: 0.9.1
+Version: 0.9.2
Release: 1%{?dist}
License: GPLv2
Group: System Environment/Base
@@ -53,6 +53,9 @@ rm -rf $RPM_BUILD_ROOT
%doc LICENSE
%changelog
+* Thu Mar 25 2010 Jan Pazdziora 0.9.2-1
+- channel_blacklist seems to be never used, removing
+
* Tue Feb 23 2010 Miroslav Suchý <msuchy(a)redhat.com> 0.9.1-1
- rebuild for rhel6
diff --git a/rel-eng/packages/yum-rhn-plugin b/rel-eng/packages/yum-rhn-plugin
index 6eb542d..6dd1d62 100644
--- a/rel-eng/packages/yum-rhn-plugin
+++ b/rel-eng/packages/yum-rhn-plugin
@@ -1 +1 @@
-0.9.1-1 client/rhel/yum-rhn-plugin/
+0.9.2-1 client/rhel/yum-rhn-plugin/
14 years, 2 months
client/rhel
by Jan Pazdziora
client/rhel/rhn-client-tools/src/up2date_client/rhnreg.py | 6 ------
client/rhel/rhn-client-tools/src/up2date_client/rhnregGui.py | 4 ++--
2 files changed, 2 insertions(+), 8 deletions(-)
New commits:
commit ee822c2566be4ae1c43ba78d34efe87de5747588
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Thu Mar 25 10:52:12 2010 +0100
registration.privacy_statement is no longer called, so remove privacyText.
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 be12620..30185fd 100644
--- a/client/rhel/rhn-client-tools/src/up2date_client/rhnreg.py
+++ b/client/rhel/rhn-client-tools/src/up2date_client/rhnreg.py
@@ -260,12 +260,6 @@ def welcomeText():
return s.registration.welcome_message()
-def privacyText():
- s = rhnserver.RhnServer()
-
- return s.registration.privacy_statement()
-
-
def finishMessage(systemId):
s = rhnserver.RhnServer()
return s.registration.finish_message(systemId)
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 8416406..d6c3451 100644
--- a/client/rhel/rhn-client-tools/src/up2date_client/rhnregGui.py
+++ b/client/rhel/rhn-client-tools/src/up2date_client/rhnregGui.py
@@ -326,7 +326,7 @@ class ChooseServerPage:
# Try to contact the server to see if we have a good cert
try:
setBusyCursor()
- rhnreg.privacyText()
+ rhnreg.welcomeText()
setArrowCursor()
except up2dateErrors.SSLCertificateVerifyFailedError:
setArrowCursor()
@@ -1169,7 +1169,7 @@ class ProvideCertificatePage:
up2dateConfig.save()
# Take the new cert for a spin
try:
- rhnreg.privacyText()
+ rhnreg.welcomeText()
except up2dateErrors.SSLCertificateVerifyFailedError:
server_url = up2dateConfig['serverURL']
#TODO: we could point the user to grab the cert from /pub if its sat
14 years, 2 months
2 commits - client/rhel
by Jan Pazdziora
client/rhel/rhn-client-tools/data/rh_register.glade | 174 -----------
client/rhel/rhn-client-tools/src/up2date_client/rhnregGui.py | 45 --
2 files changed, 1 insertion(+), 218 deletions(-)
New commits:
commit 6b7d121f1d805bc662e747d602fc82dcc77dc2a6
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Tue Mar 23 17:18:50 2010 +0100
Remove showPrivacyDialog, PrivacyDialog, and privacyDialog, as they are not used any more.
diff --git a/client/rhel/rhn-client-tools/data/rh_register.glade b/client/rhel/rhn-client-tools/data/rh_register.glade
index 82b9e34..eec1b72 100644
--- a/client/rhel/rhn-client-tools/data/rh_register.glade
+++ b/client/rhel/rhn-client-tools/data/rh_register.glade
@@ -797,162 +797,6 @@ https://www.redhat.com/wapps/sso/rhn/lostPassword.html</small></property>
</child>
</widget>
-<widget class="GtkWindow" id="privacyDialog">
- <property name="visible">True</property>
- <property name="title" translatable="yes">Red Hat Privacy Statement</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">480</property>
- <property name="default_height">400</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_NORMAL</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="vbox7">
- <property name="visible">True</property>
- <property name="homogeneous">False</property>
- <property name="spacing">0</property>
-
- <child>
- <widget class="GtkScrolledWindow" id="scrolledwindow1">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="hscrollbar_policy">GTK_POLICY_NEVER</property>
- <property name="vscrollbar_policy">GTK_POLICY_NEVER</property>
- <property name="shadow_type">GTK_SHADOW_NONE</property>
- <property name="window_placement">GTK_CORNER_TOP_LEFT</property>
-
- <child>
- <widget class="GtkViewport" id="viewport1">
- <property name="visible">True</property>
- <property name="shadow_type">GTK_SHADOW_IN</property>
-
- <child>
- <widget class="GtkFrame" id="frame3">
- <property name="visible">True</property>
- <property name="label_xalign">0</property>
- <property name="label_yalign">0.5</property>
- <property name="shadow_type">GTK_SHADOW_ETCHED_IN</property>
-
- <child>
- <widget class="GtkScrolledWindow" id="scrolledwindow2">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="hscrollbar_policy">GTK_POLICY_NEVER</property>
- <property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
- <property name="shadow_type">GTK_SHADOW_IN</property>
- <property name="window_placement">GTK_CORNER_TOP_LEFT</property>
-
- <child>
- <widget class="GtkViewport" id="viewport2">
- <property name="visible">True</property>
- <property name="shadow_type">GTK_SHADOW_IN</property>
-
- <child>
- <widget class="GtkScrolledWindow" id="scrolledwindow5">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="hscrollbar_policy">GTK_POLICY_ALWAYS</property>
- <property name="vscrollbar_policy">GTK_POLICY_ALWAYS</property>
- <property name="shadow_type">GTK_SHADOW_IN</property>
- <property name="window_placement">GTK_CORNER_TOP_LEFT</property>
-
- <child>
- <widget class="GtkTextView" id="privacyArea">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="editable">False</property>
- <property name="overwrite">False</property>
- <property name="accepts_tab">True</property>
- <property name="justification">GTK_JUSTIFY_LEFT</property>
- <property name="wrap_mode">GTK_WRAP_NONE</property>
- <property name="cursor_visible">False</property>
- <property name="pixels_above_lines">0</property>
- <property name="pixels_below_lines">0</property>
- <property name="pixels_inside_wrap">0</property>
- <property name="left_margin">0</property>
- <property name="right_margin">0</property>
- <property name="indent">0</property>
- <property name="text" translatable="yes"></property>
- </widget>
- </child>
- </widget>
- </child>
- </widget>
- </child>
- </widget>
- </child>
-
- <child>
- <widget class="GtkLabel" id="label56">
- <property name="visible">True</property>
- <property name="label" translatable="yes" context="yes">Privacy Statement</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.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>
- </widget>
- <packing>
- <property name="type">label_item</property>
- </packing>
- </child>
- </widget>
- </child>
- </widget>
- </child>
- </widget>
- <packing>
- <property name="padding">0</property>
- <property name="expand">True</property>
- <property name="fill">True</property>
- </packing>
- </child>
-
- <child>
- <widget class="GtkHButtonBox" id="hbuttonbox1">
- <property name="visible">True</property>
- <property name="layout_style">GTK_BUTTONBOX_END</property>
- <property name="spacing">10</property>
-
- <child>
- <widget class="GtkButton" id="okButton">
- <property name="visible">True</property>
- <property name="can_default">True</property>
- <property name="can_focus">True</property>
- <property name="label">gtk-ok</property>
- <property name="use_stock">True</property>
- <property name="relief">GTK_RELIEF_NORMAL</property>
- <property name="focus_on_click">True</property>
- </widget>
- </child>
- </widget>
- <packing>
- <property name="padding">5</property>
- <property name="expand">False</property>
- <property name="fill">True</property>
- </packing>
- </child>
- </widget>
- </child>
-</widget>
-
<widget class="GtkWindow" id="hardwareDialog">
<property name="visible">True</property>
<property name="title" translatable="yes">Hardware Info</property>
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 e291a66..8416406 100644
--- a/client/rhel/rhn-client-tools/src/up2date_client/rhnregGui.py
+++ b/client/rhel/rhn-client-tools/src/up2date_client/rhnregGui.py
@@ -533,9 +533,6 @@ class LoginPage:
setArrowCursor()
return False
- def showPrivacyDialog(self, button):
- PrivacyDialog()
-
def activateSubscriptionShouldBeShown():
"""If we activate an EN from disk and/or hardware info (eg asset tag) and
@@ -1319,47 +1316,6 @@ class WhyRegisterDialog:
self.rc = 1 # What does this do? Is it needed?
- def showPrivacyDialog(self, button):
- PrivacyDialog()
-
-class PrivacyDialog:
- def __init__(self):
- self.privXml = gtk.glade.XML(
- gladefile,
- "privacyDialog", domain="rhn-client-tools")
- self.dlg = self.privXml.get_widget("privacyDialog")
-
- self.privXml.get_widget("okButton").connect("clicked", self.finish)
-
- privacyArea = self.privXml.get_widget("privacyArea")
- socket.setdefaulttimeout(5)
- # see bz #165157
-
- try:
- text = callAndFilterExceptions(
- rhnreg.privacyText,
- [socket.timeout, up2dateErrors.CommunicationError],
- _("There was an error retrieving the privacy statement.")
- )
- if text is None:
- text = ""
- except (socket.timeout, up2dateErrors.CommunicationError), error:
- self.dlg.hide()
- messageWindow.ErrorDialog(_("Unable to access the server. Please "
- "check your network settings."), parent=self.dlg)
- log.log_me(error)
- return None
-
- textBuffer = gtk.TextBuffer(None)
- textBuffer.set_text(text)
- privacyArea.set_buffer(textBuffer)
-
-
- def finish(self, button):
- self.dlg.hide()
- self.rc = 1
-
-
class HardwareDialog:
def __init__(self):
self.hwXml = gtk.glade.XML(
commit e20bb63da5a7c238299e014f452b16c882984ec0
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Tue Mar 23 17:10:42 2010 +0100
Replace the button with URL for privacy statement.
diff --git a/client/rhel/rhn-client-tools/data/rh_register.glade b/client/rhel/rhn-client-tools/data/rh_register.glade
index c42cb49..82b9e34 100644
--- a/client/rhel/rhn-client-tools/data/rh_register.glade
+++ b/client/rhel/rhn-client-tools/data/rh_register.glade
@@ -3269,7 +3269,7 @@ https://www.redhat.com/wapps/sso/rhn/lostPassword.html</small></property>
<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.</small></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="use_underline">False</property>
<property name="use_markup">True</property>
<property name="justify">GTK_JUSTIFY_LEFT</property>
@@ -3290,22 +3290,6 @@ https://www.redhat.com/wapps/sso/rhn/lostPassword.html</small></property>
<property name="fill">False</property>
</packing>
</child>
-
- <child>
- <widget class="GtkButton" id="privacyButton">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="label" translatable="yes">Red Hat Privacy Statement</property>
- <property name="use_underline">True</property>
- <property name="relief">GTK_RELIEF_NORMAL</property>
- <property name="focus_on_click">True</property>
- </widget>
- <packing>
- <property name="padding">0</property>
- <property name="expand">False</property>
- <property name="fill">False</property>
- </packing>
- </child>
</widget>
<packing>
<property name="padding">0</property>
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 d55a899..e291a66 100644
--- a/client/rhel/rhn-client-tools/src/up2date_client/rhnregGui.py
+++ b/client/rhel/rhn-client-tools/src/up2date_client/rhnregGui.py
@@ -1313,7 +1313,6 @@ class WhyRegisterDialog:
self.whyRegisterXml.signal_autoconnect({
"onBackToRegistrationButtonClicked" : self.finish,
})
- self.whyRegisterXml.get_widget("privacyButton").connect("clicked", self.showPrivacyDialog)
def finish(self, button):
self.dlg.hide()
14 years, 2 months
9 commits - client/rhel
by Jan Pazdziora
client/rhel/rhn-client-tools/data/gui.glade | 23 --
client/rhel/rhn-client-tools/data/rh_register.glade | 108 ----------
client/rhel/rhn-client-tools/rhn-client-tools.spec | 1
client/rhel/rhn-client-tools/src/firstboot/Makefile | 2
client/rhel/rhn-client-tools/src/firstboot/rhn_choose_org_gui.py | 71 ------
client/rhel/rhn-client-tools/src/firstboot/rhn_login_gui.py | 4
client/rhel/rhn-client-tools/src/up2date_client/gui.py | 34 ---
client/rhel/rhn-client-tools/src/up2date_client/rhnreg.py | 78 -------
client/rhel/rhn-client-tools/src/up2date_client/rhnregGui.py | 78 -------
9 files changed, 5 insertions(+), 394 deletions(-)
New commits:
commit 15efd9c5d90e6c91fc4b27345c9fd95ccd100559
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Thu Mar 25 10:21:19 2010 +0100
As getPossibleOrgs was removed, PossibleOrgs is not used either, removing.
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 2db6b15..be12620 100644
--- a/client/rhel/rhn-client-tools/src/up2date_client/rhnreg.py
+++ b/client/rhel/rhn-client-tools/src/up2date_client/rhnreg.py
@@ -769,56 +769,6 @@ def activateHardwareInfo(username, password, hardwareInfo, orgId=None):
raise up2dateErrors.CommunicationError(message)
-# TODO Move the PossibleOrg stuff to a seperate file
-class PossibleOrgsError(Exception):
- pass
-class InvalidDefaultError(PossibleOrgsError):
- pass
-class NoDefaultError(PossibleOrgsError):
- pass
-
-class PossibleOrgs:
- def __init__(self):
- self._orgs = {}
- self._default = None
-
- def setOrgs(self, orgsDict):
- """orgsDict must be a dict of org ids (as ints or strings that contain
- ints) to org names (as strings).
-
- """
- self._orgs = {}
- for id, name in orgsDict.items():
- self._orgs[int(id)] = name
- self._default = None
-
- def setDefaultOrg(self, orgId):
- """Must refer to org that's already been added. Can be an int or string
- containing an int.
-
- """
- if int(orgId) not in self._orgs.keys():
- raise InvalidDefaultError("Tried to set default org to %s. Valid "
- "values are %s" % (orgId, self._orgs.keys()))
- self._default = int(orgId)
-
- def getOrgs(self):
- """Returns a dict of org ids (ints) to org names (strings). Can return
- an empty dict.
-
- """
- return self._orgs
-
- def getDefaultOrg(self):
- """Returns the org id (int) of the default org.
- Raises NoDefaultError if setDefaultOrg was never called or wasn't called
- after setOrgs.
-
- """
- if self._default is None:
- raise NoDefaultError()
- return self._default
-
def spawnRhnCheckForUI():
if os.access("/usr/sbin/rhn_check", os.R_OK|os.X_OK):
from subprocess import Popen, PIPE
commit 867c6219d5ac1e722797f4846f5cbe32900f83a7
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Thu Mar 25 10:19:47 2010 +0100
All invocations of getPossibleOrgs were removed, removing the function as well.
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 169b610..2db6b15 100644
--- a/client/rhel/rhn-client-tools/src/up2date_client/rhnreg.py
+++ b/client/rhel/rhn-client-tools/src/up2date_client/rhnreg.py
@@ -41,8 +41,6 @@ REMIND_FILE = "%s/rhn_register_remind" % SYSID_DIR
# REG_NUM_FILE is the new rhel 5 number.
REG_NUM_FILE = "%s/install-num" % SYSID_DIR
-cachedOrgs = None
-
import config
cfg = config.initUp2dateConfig()
log = up2dateLog.initLog()
@@ -821,32 +819,6 @@ class PossibleOrgs:
raise NoDefaultError()
return self._default
-def getPossibleOrgs(username, password, useCache=False):
- """Gets the orgs the user belongs to and the default one.
-
- If useCache is set to true it will not talk to the server and will return
- the values from the most recent non-cached call. If there is nothing cached,
- it will get the current value from the server.
-
- Returns a PossibleOrgs.
-
- Can raise:
- * up2dateErrors2.UnknownMethodException if called on a server that doesn't
- support the necessary xmlrpc (satellites won't, at least for now)
- * The usual 'communication with a server' exceptions
-
- """
- global cachedOrgs
- if useCache and cachedOrgs is not None:
- return cachedOrgs
- s = rhnserver.RhnServer()
- orgsFromServer = s.registration.get_possible_orgs(username, password)
- cachedOrgs = PossibleOrgs()
- cachedOrgs.setOrgs(orgsFromServer['orgs'])
- cachedOrgs.setDefaultOrg(orgsFromServer['default_org'])
- return cachedOrgs
-
-
def spawnRhnCheckForUI():
if os.access("/usr/sbin/rhn_check", os.R_OK|os.X_OK):
from subprocess import Popen, PIPE
commit 6dbc2a294eb825082f62d5802d6ef53f63592244
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Thu Mar 25 10:11:51 2010 +0100
Class ChooseOrgPage not used, removing.
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 202393c..d55a899 100644
--- a/client/rhel/rhn-client-tools/src/up2date_client/rhnregGui.py
+++ b/client/rhel/rhn-client-tools/src/up2date_client/rhnregGui.py
@@ -537,57 +537,6 @@ class LoginPage:
PrivacyDialog()
-class ChooseOrgPage:
- def __init__(self):
- self.chooseOrgXml = gtk.glade.XML(gladefile,
- "chooseOrgWindowVbox",
- domain="rhn-client-tools")
- # self.orgsList will have the org id in the 0th column and the
- # org name in the 1st column.
- self.orgsList = gtk.ListStore(gobject.TYPE_INT, gobject.TYPE_STRING)
- self.orgsComboBox = self.chooseOrgXml.get_widget("orgsComboBox")
- self.orgsComboBox.set_model(self.orgsList)
- cell = gtk.CellRendererText()
- self.orgsComboBox.pack_start(cell, True)
- self.orgsComboBox.add_attribute(cell, 'text', 1)
- self.useCachedOrgs = False
-
- def chooseOrgPageVbox(self):
- return self.chooseOrgXml.get_widget("chooseOrgWindowVbox")
-
- def chooseOrgPagePrepare(self, useCachedOrgs=False):
- """The loose function chooseOrgShouldBeShown() should be used to find
- out if this page should be shown or not.
-
- """
- # TODO add support for args to callAndFilterExceptions and pass
- # useCachedOrgs as an arg
- self.useCachedOrgs = useCachedOrgs
- callAndFilterExceptions(
- self._chooseOrgPagePrepare,
- [],
- _("There was an error while getting the list of organizations.")
- )
-
- def _chooseOrgPagePrepare(self):
- """Functionality for chooseOrgPagePrepare but might raise exceptions."""
- global username, password
- setBusyCursor()
- possibleOrgs = rhnreg.getPossibleOrgs(username, password,
- self.useCachedOrgs)
- setArrowCursor()
- self.orgsList.clear()
- for orgId, orgName in possibleOrgs.getOrgs().items():
- row = self.orgsList.append([orgId, orgName])
- if orgId == possibleOrgs.getDefaultOrg():
- self.orgsComboBox.set_active_iter(row)
-
- def chooseOrgPageApply(self):
- global organization
- activeIndex = self.orgsComboBox.get_active()
- organization = self.orgsList[activeIndex][0]
-
-
def activateSubscriptionShouldBeShown():
"""If we activate an EN from disk and/or hardware info (eg asset tag) and
one of them provides an entitlement for the base channel the system needs
commit 45578481a0c7b97cf07d6b1ee3cfe0af13b6c618
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Thu Mar 25 10:11:26 2010 +0100
chooseOrgShouldBeShown is unused by now, removing.
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 46ead3a..202393c 100644
--- a/client/rhel/rhn-client-tools/src/up2date_client/rhnregGui.py
+++ b/client/rhel/rhn-client-tools/src/up2date_client/rhnregGui.py
@@ -537,19 +537,6 @@ class LoginPage:
PrivacyDialog()
-def chooseOrgShouldBeShown():
- """Decides whether we should show the choose org page or not.
-
- Returns True if we're talking to hosted and the user belongs to at least 2
- orgs. If an error occurs, it is logged and True returned. Returns False
- otherwise.
-
- This is a loose function because it's difficult to use it in firstboot
- where we want to without a hack if it's in ChooseOrgPage.
-
- """
- return False
-
class ChooseOrgPage:
def __init__(self):
self.chooseOrgXml = gtk.glade.XML(gladefile,
commit 358c89dd8f5848af6a54f78483f8370f2d4e6e27
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Thu Mar 25 10:09:34 2010 +0100
Remove the chooseOrg* from glade as well.
diff --git a/client/rhel/rhn-client-tools/data/gui.glade b/client/rhel/rhn-client-tools/data/gui.glade
index a6ec4eb..a69df88 100644
--- a/client/rhel/rhn-client-tools/data/gui.glade
+++ b/client/rhel/rhn-client-tools/data/gui.glade
@@ -101,29 +101,6 @@
</child>
<child>
- <widget class="GnomeDruidPageStandard" id="chooseOrgPage">
- <property name="visible">True</property>
- <property name="title" translatable="yes">Select organization</property>
- <property name="logo">shadowman-round-48.png</property>
- <signal name="next" handler="onChooseOrgPageNext"/>
- <signal name="prepare" handler="onChooseOrgPagePrepare"/>
-
- <child internal-child="vbox">
- <widget class="GtkVBox" id="chooseOrgPageVbox">
- <property name="border_width">16</property>
- <property name="visible">True</property>
- <property name="homogeneous">False</property>
- <property name="spacing">6</property>
-
- <child>
- <placeholder/>
- </child>
- </widget>
- </child>
- </widget>
- </child>
-
- <child>
<widget class="GnomeDruidPageStandard" id="activateSubscriptionPage">
<property name="visible">True</property>
<property name="title" translatable="yes">Access a subscription</property>
diff --git a/client/rhel/rhn-client-tools/data/rh_register.glade b/client/rhel/rhn-client-tools/data/rh_register.glade
index f948565..c42cb49 100644
--- a/client/rhel/rhn-client-tools/data/rh_register.glade
+++ b/client/rhel/rhn-client-tools/data/rh_register.glade
@@ -4079,114 +4079,6 @@ To keep your system updated, secure, and supported, please connect this system t
</child>
</widget>
-<widget class="GtkWindow" id="chooseOrgWindow">
- <property name="title" translatable="yes"></property>
- <property name="type">GTK_WINDOW_TOPLEVEL</property>
- <property name="window_position">GTK_WIN_POS_NONE</property>
- <property name="modal">False</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_NORMAL</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="chooseOrgWindowVbox">
- <property name="visible">True</property>
- <property name="homogeneous">False</property>
- <property name="spacing">20</property>
-
- <child>
- <widget class="GtkLabel" id="label23">
- <property name="visible">True</property>
- <property name="label" translatable="yes" context="yes">Your account is associated with multiple <b>organizations</b>. You will need to select an organization to register this system to.</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.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>
- </widget>
- <packing>
- <property name="padding">0</property>
- <property name="expand">False</property>
- <property name="fill">True</property>
- </packing>
- </child>
-
- <child>
- <widget class="GtkHBox" id="orgsHbox">
- <property name="visible">True</property>
- <property name="homogeneous">False</property>
- <property name="spacing">6</property>
-
- <child>
- <widget class="GtkLabel" id="label24">
- <property name="visible">True</property>
- <property name="label" translatable="yes" context="yes">_Organization:</property>
- <property name="use_underline">True</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>
- </widget>
- <packing>
- <property name="padding">0</property>
- <property name="expand">False</property>
- <property name="fill">False</property>
- </packing>
- </child>
-
- <child>
- <widget class="GtkComboBox" id="orgsComboBox">
- <property name="visible">True</property>
- <property name="add_tearoffs">False</property>
- <property name="focus_on_click">True</property>
- </widget>
- <packing>
- <property name="padding">0</property>
- <property name="expand">True</property>
- <property name="fill">True</property>
- </packing>
- </child>
-
- <child>
- <placeholder/>
- </child>
- </widget>
- <packing>
- <property name="padding">0</property>
- <property name="expand">False</property>
- <property name="fill">True</property>
- </packing>
- </child>
-
- <child>
- <placeholder/>
- </child>
- </widget>
- </child>
-</widget>
-
<widget class="GtkDialog" id="confirmAllUpdatesDialog">
<property name="title" translatable="yes">Confirm operation system release selection</property>
<property name="type">GTK_WINDOW_TOPLEVEL</property>
commit 4919ecc384367e1da832b36d39315c0cc6ced28c
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Thu Mar 25 09:17:44 2010 +0100
With the removal of the if branch, ChooseOrgPage is not used either, removing the invocation and related code.
diff --git a/client/rhel/rhn-client-tools/src/up2date_client/gui.py b/client/rhel/rhn-client-tools/src/up2date_client/gui.py
index b7adf59..dd7ee7b 100644
--- a/client/rhel/rhn-client-tools/src/up2date_client/gui.py
+++ b/client/rhel/rhn-client-tools/src/up2date_client/gui.py
@@ -43,7 +43,7 @@ import rhnregGui
class Gui(rhnregGui.StartPage, rhnregGui.ChooseServerPage, rhnregGui.LoginPage,
- rhnregGui.ChooseOrgPage, rhnregGui.ActivateSubscriptionPage,
+ rhnregGui.ActivateSubscriptionPage,
rhnregGui.ReviewSubscriptionPage, rhnregGui.CreateProfilePage,
rhnregGui.ProvideCertificatePage, rhnregGui.FinishPage,
rhnregGui.ChooseChannelPage):
@@ -61,8 +61,6 @@ class Gui(rhnregGui.StartPage, rhnregGui.ChooseServerPage, rhnregGui.LoginPage,
"onChooseServerPageNext" : self.onChooseServerPageNext,
"onLoginPagePrepare" : self.onLoginPagePrepare,
"onLoginPageNext" : self.onLoginPageNext,
- "onChooseOrgPagePrepare" : self.onChooseOrgPagePrepare,
- "onChooseOrgPageNext" : self.onChooseOrgPageNext,
"onActivateSubscriptionPagePrepare" : self.onActivateSubscriptionPagePrepare,
"onActivateSubscriptionPageBack" : self.onActivateSubscriptionPageBack,
"onActivateSubscriptionPageNext" : self.onActivateSubscriptionPageNext,
@@ -84,7 +82,6 @@ class Gui(rhnregGui.StartPage, rhnregGui.ChooseServerPage, rhnregGui.LoginPage,
rhnregGui.StartPage.__init__(self)
rhnregGui.ChooseServerPage.__init__(self)
rhnregGui.LoginPage.__init__(self)
- rhnregGui.ChooseOrgPage.__init__(self)
rhnregGui.ActivateSubscriptionPage.__init__(self)
rhnregGui.ChooseChannelPage.__init__(self)
rhnregGui.CreateProfilePage.__init__(self)
@@ -102,9 +99,6 @@ class Gui(rhnregGui.StartPage, rhnregGui.ChooseServerPage, rhnregGui.LoginPage,
contents = self.loginPageVbox()
container = self.xml.get_widget("loginPageVbox")
container.pack_start(contents, True)
- contents = self.chooseOrgPageVbox()
- container = self.xml.get_widget("chooseOrgPageVbox")
- container.pack_start(contents, True)
contents = self.activateSubscriptionPageVbox()
container = self.xml.get_widget("linkToSubscriptionPageVbox")
container.pack_start(contents, True)
@@ -127,7 +121,6 @@ class Gui(rhnregGui.StartPage, rhnregGui.ChooseServerPage, rhnregGui.LoginPage,
self.initProfile = False
self.oemInfo = {}
self.productInfo = {}
- self.showedChooseOrgPage = False
self.showedActivateSubscriptionPage = False
self.druid = self.xml.get_widget("druid")
@@ -142,7 +135,6 @@ class Gui(rhnregGui.StartPage, rhnregGui.ChooseServerPage, rhnregGui.LoginPage,
self.provideCertificatePage = self.xml.get_widget("provideCertificatePage")
self.activateSubscriptionPage = \
self.xml.get_widget("activateSubscriptionPage")
- self.chooseOrgPage = self.xml.get_widget("chooseOrgPage")
self.loginPage = self.xml.get_widget("loginPage")
self.chooseChannelPage = self.xml.get_widget("chooseChannelPage")
self.createProfilePage = self.xml.get_widget("createProfilePage")
@@ -248,7 +240,6 @@ class Gui(rhnregGui.StartPage, rhnregGui.ChooseServerPage, rhnregGui.LoginPage,
"""This function is used by the create new account dialog so it doesn't
need to have any knowledge of the screen mechanism or order.
"""
- self.showedChooseOrgPage = False
self.showedActivateSubscriptionPage = False
if rhnregGui.activateSubscriptionShouldBeShown():
self.druid.set_page(self.activateSubscriptionPage)
@@ -258,27 +249,12 @@ class Gui(rhnregGui.StartPage, rhnregGui.ChooseServerPage, rhnregGui.LoginPage,
self.druid.set_page(self.createProfilePage)
- def onChooseOrgPagePrepare(self, page, dummy):
- self.showedChooseOrgPage = True
- self.chooseOrgPagePrepare(useCachedOrgs=True)
-
- def onChooseOrgPageNext(self, page, dummy):
- self.chooseOrgPageApply()
- if rhnregGui.activateSubscriptionShouldBeShown():
- self.druid.set_page(self.activateSubscriptionPage)
- else:
- self.druid.set_page(self.createProfilePage)
- return True
-
def onActivateSubscriptionPagePrepare(self, page, dummy):
self.showedActivateSubscriptionPage = True
self.activateSubscriptionPagePrepare()
def onActivateSubscriptionPageBack(self, page, dummy):
- if self.showedChooseOrgPage:
- self.druid.set_page(self.chooseOrgPage)
- else:
- self.druid.set_page(self.loginPage)
+ self.druid.set_page(self.loginPage)
return True
def onActivateSubscriptionPageNext(self, page, dummy):
@@ -294,8 +270,6 @@ class Gui(rhnregGui.StartPage, rhnregGui.ChooseServerPage, rhnregGui.LoginPage,
def onChooseChannelPageBack(self, page, dummy):
if self.showedActivateSubscriptionPage == True:
self.druid.set_page(self.activateSubscriptionPage)
- elif self.showedChooseOrgPage == True:
- self.druid.set_page(self.chooseOrgPage)
else:
self.druid.set_page(self.loginPage)
commit 36064664b4bca4e23183ce65fa714e89a6a1b397
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Thu Mar 25 09:10:04 2010 +0100
With the removal of the if branch, rhn_choose_org_gui is not used either, removing.
diff --git a/client/rhel/rhn-client-tools/rhn-client-tools.spec b/client/rhel/rhn-client-tools/rhn-client-tools.spec
index 567cd96..91490db 100644
--- a/client/rhel/rhn-client-tools/rhn-client-tools.spec
+++ b/client/rhel/rhn-client-tools/rhn-client-tools.spec
@@ -221,7 +221,6 @@ make -f Makefile.rhn-client-tools test
%{_datadir}/firstboot/modules/rhn_choose_server_gui.*
%{_datadir}/firstboot/modules/rhn_provide_certificate_gui.*
%{_datadir}/firstboot/modules/rhn_create_profile_gui.*
-%{_datadir}/firstboot/modules/rhn_choose_org_gui.*
%{_datadir}/firstboot/modules/rhn_review_gui.*
%{_datadir}/firstboot/modules/rhn_finish_gui.*
diff --git a/client/rhel/rhn-client-tools/src/firstboot/Makefile b/client/rhel/rhn-client-tools/src/firstboot/Makefile
index bbdea5f..0a9a461 100644
--- a/client/rhel/rhn-client-tools/src/firstboot/Makefile
+++ b/client/rhel/rhn-client-tools/src/firstboot/Makefile
@@ -4,7 +4,7 @@
MODULES = rhn_login_gui \
rhn_activate_gui rhn_register_firstboot_gui_window \
- rhn_start_gui rhn_choose_server_gui rhn_choose_org_gui \
+ rhn_start_gui rhn_choose_server_gui \
rhn_provide_certificate_gui rhn_create_profile_gui \
rhn_review_gui rhn_finish_gui
PYFILES = $(addsuffix .py, $(MODULES))
diff --git a/client/rhel/rhn-client-tools/src/firstboot/rhn_choose_org_gui.py b/client/rhel/rhn-client-tools/src/firstboot/rhn_choose_org_gui.py
deleted file mode 100644
index a3b20c7..0000000
--- a/client/rhel/rhn-client-tools/src/firstboot/rhn_choose_org_gui.py
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 2006 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; either version 2 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-#
-# Authors:
-# Daniel Benamy <dbenamy(a)redhat.com>
-
-import sys
-sys.path.append("/usr/share/rhn/up2date_client/")
-sys.path.append("/usr/share/rhn")
-import rhnreg
-import rhnregGui
-from rhn_register_firstboot_gui_window import RhnRegisterFirstbootGuiWindow
-
-import gtk
-from gtk import glade
-import gettext
-_ = gettext.gettext
-
-gettext.textdomain("rhn-client-tools")
-gtk.glade.bindtextdomain("rhn-client-tools")
-
-
-class RhnChooseOrgWindow(RhnRegisterFirstbootGuiWindow, rhnregGui.ChooseOrgPage):
- runPriority=108.2
- moduleName = _("Choose Organization")
- windowTitle = moduleName
- shortMessage = _("Choose an organization to use with this username")
- needsparent = 1
- needsnetwork = 1
- noSidebar = True
-
- def __init__(self):
- RhnRegisterFirstbootGuiWindow.__init__(self)
- rhnregGui.ChooseOrgPage.__init__(self)
- if rhnreg.registered():
- self.skipme = True
-
- def _getVbox(self):
- return self.chooseOrgPageVbox()
-
- def updatePage(self):
- self.chooseOrgPagePrepare()
-
- def apply(self, *args):
- """Returns None to stay on the same page. Anything else will cause
- firstboot to advance but True is generally used. This is different from
- the gnome druid in rhn_register.
-
- """
- self.chooseOrgPageApply()
- if rhnregGui.activateSubscriptionShouldBeShown():
- self.parent.setPage("rhn_activate_gui")
- else:
- self.parent.setPage("rhn_create_profile_gui")
- return True
-
-
-childWindow = RhnChooseOrgWindow
commit c59aae33576cdeb57937e66c40b3d8ec24db4d89
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Thu Mar 25 09:04:03 2010 +0100
As chooseOrgShouldBeShown always returns False now, dropping the if branches.
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
index 05e070c..05c52c7 100644
--- a/client/rhel/rhn-client-tools/src/firstboot/rhn_login_gui.py
+++ b/client/rhel/rhn-client-tools/src/firstboot/rhn_login_gui.py
@@ -113,9 +113,7 @@ class RhnLoginWindow(RhnRegisterFirstbootGuiWindow, rhnregGui.LoginPage):
if ret:
return None
- if rhnregGui.chooseOrgShouldBeShown():
- self.parent.setPage("rhn_choose_org_gui")
- elif rhnregGui.activateSubscriptionShouldBeShown():
+ if rhnregGui.activateSubscriptionShouldBeShown():
self.parent.setPage("rhn_activate_gui")
else:
self.parent.setPage('rhn_create_profile_gui')
diff --git a/client/rhel/rhn-client-tools/src/up2date_client/gui.py b/client/rhel/rhn-client-tools/src/up2date_client/gui.py
index 767d1b5..b7adf59 100644
--- a/client/rhel/rhn-client-tools/src/up2date_client/gui.py
+++ b/client/rhel/rhn-client-tools/src/up2date_client/gui.py
@@ -250,9 +250,7 @@ class Gui(rhnregGui.StartPage, rhnregGui.ChooseServerPage, rhnregGui.LoginPage,
"""
self.showedChooseOrgPage = False
self.showedActivateSubscriptionPage = False
- if rhnregGui.chooseOrgShouldBeShown():
- self.druid.set_page(self.chooseOrgPage)
- elif rhnregGui.activateSubscriptionShouldBeShown():
+ if rhnregGui.activateSubscriptionShouldBeShown():
self.druid.set_page(self.activateSubscriptionPage)
elif rhnregGui.chooseChannelShouldBeShown():
self.druid.set_page(self.chooseChannelPage)
commit 368773955a509665962226fc6bd646d5b586587d
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Thu Mar 25 09:00:51 2010 +0100
As RHN hosted never returns more than one org, chooseOrgShouldBeShown can just return False.
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 0ef8db6..46ead3a 100644
--- a/client/rhel/rhn-client-tools/src/up2date_client/rhnregGui.py
+++ b/client/rhel/rhn-client-tools/src/up2date_client/rhnregGui.py
@@ -548,21 +548,7 @@ def chooseOrgShouldBeShown():
where we want to without a hack if it's in ChooseOrgPage.
"""
- global organization
- organization = None
- try:
- setBusyCursor()
- possibleOrgs = rhnreg.getPossibleOrgs(username, password)
- setArrowCursor()
- if len(possibleOrgs.getOrgs()) < 2:
- return False
- except:
- setArrowCursor()
- log.log_me("There was an exception while trying to get the list of orgs"
- " to determine whether or not to show the choose org screen:")
- log.log_exception(*sys.exc_info())
- return False
- return True
+ return False
class ChooseOrgPage:
def __init__(self):
14 years, 2 months
client/rhel
by Jan Pazdziora
client/rhel/rhn-client-tools/src/up2date_client/tui.py | 1 -
1 file changed, 1 deletion(-)
New commits:
commit 676edfe077d739d04011708a31a919655850140f
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Wed Mar 24 17:18:05 2010 +0100
Skip the OrgGroupWindow invocation harder.
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 405b5e4..1750b2a 100644
--- a/client/rhel/rhn-client-tools/src/up2date_client/tui.py
+++ b/client/rhel/rhn-client-tools/src/up2date_client/tui.py
@@ -1122,7 +1122,6 @@ class Tui:
ConnectWindow,
StartWindow,
InfoWindow,
- OrgGroupWindow,
OSReleaseWindow,
HardwareWindow,
PackagesWindow,
14 years, 2 months
3 commits - client/rhel
by Jan Pazdziora
client/rhel/rhn-client-tools/src/up2date_client/tui.py | 110 -----------------
1 file changed, 110 deletions(-)
New commits:
commit 8adfb5672a69f5edf6dd0d1443a4a9ba02e125ab
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Wed Mar 24 15:48:17 2010 +0100
hasMultipleOrgs, orgs, and default_org not used anymore, removing.
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 d6d1695..405b5e4 100644
--- a/client/rhel/rhn-client-tools/src/up2date_client/tui.py
+++ b/client/rhel/rhn-client-tools/src/up2date_client/tui.py
@@ -1112,9 +1112,6 @@ class Tui:
self.size = snack._snack.size()
self.drawFrame()
self.alreadyRegistered = 0
- self.hasMultipleOrgs = 0
- self.orgs = None
- self.default_org = None
try:
self.serverType = rhnreg.getServerType()
except up2dateErrors.InvalidProtocolError:
@@ -1321,8 +1318,6 @@ class Tui:
# Don't offer group selection screen if the user is not
# a member of multiple groups.
log.log_debug("index is %s" % index)
- log.log_debug("win.name is %s, hasMultipleOrgs is %s" % \
- (win.name, self.hasMultipleOrgs))
if win.name == 'OSReleaseWindow':
channels = rhnreg.getAvailableChannels(self.userName,
commit 0e45017b0c59306853c7b6b1e705f75d633b015c
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Wed Mar 24 12:04:02 2010 +0100
Skip the OrgGroupWindow invocation.
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 d776dda..d6d1695 100644
--- a/client/rhel/rhn-client-tools/src/up2date_client/tui.py
+++ b/client/rhel/rhn-client-tools/src/up2date_client/tui.py
@@ -424,85 +424,6 @@ class InfoWindow:
self.screen.popWindow()
return button
-class OrgGroupWindow:
-
- def __init__(self, screen, tui):
- self.name = "OrgGroupWindow"
- self.screen = screen
- self.tui = tui
- self.size = snack._snack.size()
-
-
- toplevel = snack.GridForm(screen, ORG_SELECT, 1, 4)
- tb = snack.Textbox(self.size[0]-10, self.size[1]-15,
- ORG_SELECT_PROMPT % self.tui.userName + "\n\n",
- wrap = 1)
-
- toplevel.add(tb, 0, 0, anchorLeft = 1)
-
- label = snack.Label(ORG_PROMPT)
- toplevel.add(label, 0, 1, anchorLeft = 1)
-
- buttonlist = []
-
- if self.tui.orgs != None:
- for org_group_id, org_group_label in self.tui.orgs.items():
- if org_group_id == self.tui.default_org:
- buttonlist.append((org_group_label, org_group_id, 1))
- else:
- buttonlist.append((org_group_label, org_group_id, 0))
-
- self.org_group_select_list = snack.RadioBar(self.screen, buttonlist)
- toplevel.add(self.org_group_select_list, 0, 2)
-
- self.g = toplevel
-
- # BUTTON BAR
- self.bb = snack.ButtonBar(screen,
- [(NEXT, "next"),
- (BACK, "back"),
- (CANCEL, "cancel")])
- toplevel.add(self.bb, 0, 3, padding = (0, 1, 0, 0),
- growx = 1)
-
- def run(self):
- log.log_debug("Running %s" % self.__class__.__name__)
- self.tui.saw_org_window = 1
- self.screen.refresh()
- valid = 0
- while not valid:
- result = self.g.run()
- button = self.bb.buttonPressed(result)
-
- if result == "F12":
- button = "next"
-
- if button == "next":
- valid = self.validateFields()
- else:
- break
-
- if button == "next":
- valid = self.validateFields()
- else:
- break
-
- self.screen.popWindow()
- return button
-
- def validateFields(self):
- if self.org_group_select_list.getSelection() != None:
- return 1
- else:
- return 0
-
-
- def saveResults(self):
- self.tui.other['org_id'] = self.org_group_select_list.getSelection()
- log.log_debug('Set org_id as %s' % self.tui.other['org_id'])
- return 1
-
-
class OSReleaseWindow:
def __init__(self, screen, tui):
@@ -1403,11 +1324,6 @@ class Tui:
log.log_debug("win.name is %s, hasMultipleOrgs is %s" % \
(win.name, self.hasMultipleOrgs))
- if win.name == 'OrgGroupWindow':
- if not self.hasMultipleOrgs:
- index = index + 1
- continue
-
if win.name == 'OSReleaseWindow':
channels = rhnreg.getAvailableChannels(self.userName,
self.password)
commit 3dbc1fb60047e850b2519e7c8e3c663f67a125f6
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Wed Mar 24 12:02:10 2010 +0100
Do not call getPossibleOrgs / registration.get_possible_orgs in TUI.
The get_possible_orgs on RHN hosted returns one org anyway,
support of multiple orgs per user has been abandonded.
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 46b75e4..d776dda 100644
--- a/client/rhel/rhn-client-tools/src/up2date_client/tui.py
+++ b/client/rhel/rhn-client-tools/src/up2date_client/tui.py
@@ -418,27 +418,6 @@ class InfoWindow:
if valid == 0:
continue
- # Now that we have username, look up the groups for that user
- # if we're going against hosted.
- if self.tui.serverType == 'hosted':
- orgs = rhnreg.PossibleOrgs()
- orgs = tui_call_wrapper(self.screen,
- rhnreg.getPossibleOrgs,
- self.userNameEntry.value(),
- self.passwordEntry.value())
-
- if orgs == None or orgs == 0:
- valid = 0
- continue
-
- self.tui.orgs = orgs.getOrgs()
- self.tui.default_org = orgs.getDefaultOrg()
-
- if len(self.tui.orgs) > 1:
- self.tui.hasMultipleOrgs = 1
-
- self.tui.other['org_id'] = self.tui.default_org
-
else:
break
14 years, 2 months
2 commits - java/code
by Tomas Lestach
java/code/src/com/redhat/rhn/common/db/datasource/xml/Package_queries.xml | 7 +++++--
java/code/src/com/redhat/rhn/frontend/dto/PackageDto.java | 2 +-
java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/PackageDtoSerializer.java | 4 ++++
3 files changed, 10 insertions(+), 3 deletions(-)
New commits:
commit f4da592071efc56e040ec32e148f401494a60255
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Wed Mar 24 16:22:38 2010 +0100
559693 - fixing apidoc
diff --git a/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/PackageDtoSerializer.java b/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/PackageDtoSerializer.java
index d557198..db0d6b1 100644
--- a/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/PackageDtoSerializer.java
+++ b/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/PackageDtoSerializer.java
@@ -34,6 +34,8 @@ import redstone.xmlrpc.XmlRpcSerializer;
* #prop("string", "version")
* #prop("string", "release")
* #prop("string", "epoch")
+ * #prop("string", "checksum")
+ * #prop("string", "checksum_type")
* #prop("int", "id")
* #prop("string", "arch_label")
* #prop("string", "last_modified_date")
commit 1822a606bdf6072e29af4b08b9e8ca7b4e6415cb
Author: Colin Coe <colin.coe(a)gmail.com>
Date: Fri Mar 19 21:01:57 2010 +0800
559693 - allow channel.software.listAllPackages to return the checksum
This is a rebase of three original commits
BZ 559693 - allow channel.software.listAllPackages to return the checksum
BZ 559693 - allow channel.software.listAllPackages, take 2
BZ 559693 - display checksum type
diff --git a/java/code/src/com/redhat/rhn/common/db/datasource/xml/Package_queries.xml b/java/code/src/com/redhat/rhn/common/db/datasource/xml/Package_queries.xml
index 1fbb01a..03f14db 100644
--- a/java/code/src/com/redhat/rhn/common/db/datasource/xml/Package_queries.xml
+++ b/java/code/src/com/redhat/rhn/common/db/datasource/xml/Package_queries.xml
@@ -1259,14 +1259,17 @@ SELECT P.id AS id,
NVL(PE.release, ' ') as release,
NVL(PE.epoch, ' ') as epoch,
PA.label AS arch_label,
- TO_CHAR(P.last_modified, 'YYYY-MM-DD HH24:MI:SS') AS last_modified
+ TO_CHAR(P.last_modified, 'YYYY-MM-DD HH24:MI:SS') AS last_modified,
+ CV.checksum as checksum,
+ CV.checksum_type as checksum_type
FROM rhnPackageArch PA, rhnPackageName PN, rhnPackageEVR PE, rhnPackage P,
- rhnChannelPackage CP
+ rhnChannelPackage CP, rhnChecksumView CV
WHERE CP.channel_id = :cid
AND CP.package_id = P.id
AND P.name_id = PN.id
AND P.evr_id = PE.id
AND PA.id = P.package_arch_id
+ AND P.checksum_id = CV.id
ORDER BY UPPER(name)
</query>
</mode>
diff --git a/java/code/src/com/redhat/rhn/frontend/dto/PackageDto.java b/java/code/src/com/redhat/rhn/frontend/dto/PackageDto.java
index 9f4510a..0e00dc5 100644
--- a/java/code/src/com/redhat/rhn/frontend/dto/PackageDto.java
+++ b/java/code/src/com/redhat/rhn/frontend/dto/PackageDto.java
@@ -213,7 +213,7 @@ public class PackageDto extends BaseDto {
*
* @param checksumTypeIn The checksumtype to set
*/
- public void setChecksumtype(String checksumTypeIn) {
+ public void setChecksumType(String checksumTypeIn) {
this.checksumType = checksumTypeIn;
}
diff --git a/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/PackageDtoSerializer.java b/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/PackageDtoSerializer.java
index eeb2af7..d557198 100644
--- a/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/PackageDtoSerializer.java
+++ b/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/PackageDtoSerializer.java
@@ -66,6 +66,8 @@ public class PackageDtoSerializer implements XmlRpcCustomSerializer {
epoch = "";
}
helper.add("epoch", epoch == null ? "" : epoch);
+ helper.add("checksum", pack.getChecksum());
+ helper.add("checksum_type", pack.getChecksumType());
helper.add("id", pack.getId());
helper.add("arch_label", pack.getArchLabel());
helper.add("last_modified_date", pack.getLastModified());
14 years, 2 months
Changes to 'refs/tags/spacewalk-java-0.9.11-1'
by Michael Mraka
Tag 'spacewalk-java-0.9.11-1' created by Michael Mraka <michael.mraka(a)redhat.com> at 2010-03-24 15:13 +0000
Tagging package [spacewalk-java] version [0.9.11-1] in directory [java/].
Changes since spacewalk-setup-0.9.3-1:
Jan Pazdziora (2):
Remove serverSupportsRhelFiveCalls: just assume the server supports RHEL 5 calls by now.
As validateCaps now returns False in all cases, remove its invocations.
Michael Mraka (3):
added tomcat6
added packages no more automaticaly required in tomcat6
Automatic commit of package [spacewalk-java] release [0.9.11-1].
Miroslav Suchý (1):
575127 - fix typo in dmidecode key
---
backend/satellite_tools/spacewalk-debug | 14 +++--
client/rhel/rhn-client-tools/src/up2date_client/hardware.py | 8 +--
client/rhel/rhn-client-tools/src/up2date_client/rhnreg.py | 28 -----------
client/rhel/rhn-client-tools/src/up2date_client/rhnregGui.py | 22 --------
client/rhel/rhn-client-tools/src/up2date_client/tui.py | 9 ---
java/spacewalk-java.spec | 8 ++-
rel-eng/packages/spacewalk-java | 2
7 files changed, 20 insertions(+), 71 deletions(-)
---
14 years, 2 months
3 commits - backend/satellite_tools java/spacewalk-java.spec rel-eng/packages
by Michael Mraka
backend/satellite_tools/spacewalk-debug | 14 ++++++++------
java/spacewalk-java.spec | 8 +++++++-
rel-eng/packages/spacewalk-java | 2 +-
3 files changed, 16 insertions(+), 8 deletions(-)
New commits:
commit d174e420ec63c36bc263d0c757eee0a42cde7afc
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Wed Mar 24 16:13:05 2010 +0100
Automatic commit of package [spacewalk-java] release [0.9.11-1].
diff --git a/java/spacewalk-java.spec b/java/spacewalk-java.spec
index 3062142..fa0fb47 100644
--- a/java/spacewalk-java.spec
+++ b/java/spacewalk-java.spec
@@ -19,7 +19,7 @@ Name: spacewalk-java
Summary: Spacewalk Java site packages
Group: Applications/Internet
License: GPLv2
-Version: 0.9.10
+Version: 0.9.11
Release: 1%{?dist}
URL: https://fedorahosted.org/spacewalk
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
@@ -310,6 +310,10 @@ fi
%{jardir}/postgresql-jdbc.jar
%changelog
+* Wed Mar 24 2010 Michael Mraka <michael.mraka(a)redhat.com> 0.9.11-1
+- fixed Requires for tomcat6
+- test case fix for SystemHandlerTest
+
* Mon Mar 22 2010 Tomas Lestach <tlestach(a)redhat.com> 0.9.10-1
- 575796 - make system.get_name API call faster (tlestach(a)redhat.com)
- 529359 - attempting to fix issue where solaris packages couldnt be installed,
diff --git a/rel-eng/packages/spacewalk-java b/rel-eng/packages/spacewalk-java
index 1083e55..17fb0d6 100644
--- a/rel-eng/packages/spacewalk-java
+++ b/rel-eng/packages/spacewalk-java
@@ -1 +1 @@
-0.9.10-1 java/
+0.9.11-1 java/
commit 47d3d4acd3bcf1a92d2d990ab620ca53d3f211de
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Wed Mar 24 15:52:15 2010 +0100
added packages no more automaticaly required in tomcat6
diff --git a/java/spacewalk-java.spec b/java/spacewalk-java.spec
index 98c4ac7..3062142 100644
--- a/java/spacewalk-java.spec
+++ b/java/spacewalk-java.spec
@@ -37,6 +37,7 @@ Requires: java-devel >= 0:1.6.0
Requires: jakarta-commons-lang >= 0:2.1
Requires: jakarta-commons-codec
Requires: jakarta-commons-cli
+Requires: jakarta-commons-el
Requires: jakarta-commons-io
Requires: jakarta-commons-logging
Requires: jakarta-taglibs-standard
@@ -77,6 +78,7 @@ BuildRequires: tanukiwrapper
%if 0%{?rhel} && 0%{?rhel} < 5
BuildRequires: javamail
%else
+Requires: classpathx-mail
BuildRequires: classpathx-mail
%endif
BuildRequires: jsp
commit d6cf9bca1bdb01fc9904d1c150db6fbaa459496d
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Wed Mar 24 13:43:53 2010 +0100
added tomcat6
diff --git a/backend/satellite_tools/spacewalk-debug b/backend/satellite_tools/spacewalk-debug
index 0d6d9dd..457c671 100755
--- a/backend/satellite_tools/spacewalk-debug
+++ b/backend/satellite_tools/spacewalk-debug
@@ -115,12 +115,14 @@ if [ -d /etc/jabberd ]; then
fi
# tomcat for spacewalk 400+
-if [ -d /etc/tomcat5 ]; then
- cp -fapRd /etc/tomcat5 $DIR/conf/tomcat
-fi
-if [ -d /var/log/tomcat5 ]; then
- cp -fapRd /var/log/tomcat5 $DIR/tomcat-logs
-fi
+for tomcat in tomcat5 tomcat6 ; do
+ if [ -d /etc/$tomcat ]; then
+ cp -fapRd /etc/$tomcat $DIR/conf/tomcat
+ fi
+ if [ -d /var/log/$tomcat ]; then
+ cp -fapRd /var/log/$tomcat $DIR/tomcat-logs
+ fi
+done
#entitlement report
if [ -e /usr/share/rhn/satellite_tools/rhn-entitlement-report.py ]; then
14 years, 2 months
2 commits - client/rhel
by Jan Pazdziora
client/rhel/rhn-client-tools/src/up2date_client/rhnreg.py | 28 -----------
client/rhel/rhn-client-tools/src/up2date_client/rhnregGui.py | 22 --------
client/rhel/rhn-client-tools/src/up2date_client/tui.py | 9 ---
3 files changed, 59 deletions(-)
New commits:
commit 88e09834f5250bc4ac282b47e887318099403eca
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Wed Mar 24 15:55:00 2010 +0100
As validateCaps now returns False in all cases, remove its invocations.
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 643e9cf..0ef8db6 100644
--- a/client/rhel/rhn-client-tools/src/up2date_client/rhnregGui.py
+++ b/client/rhel/rhn-client-tools/src/up2date_client/rhnregGui.py
@@ -378,9 +378,6 @@ class ChooseServerPage:
dialog.run()
return True
- if validateCaps() is True: # There was an error
- return True
-
return False
@@ -1275,9 +1272,6 @@ class ProvideCertificatePage:
errorWindow(_("There was an SSL error. This could be because the file you picked was not a certificate file."))
return ERROR_WAS_HANDLED
- if validateCaps() is True: # There was an error
- return SERVER_TOO_OLD
-
return CERT_INSTALLED
except IOError, e:
@@ -1776,17 +1770,6 @@ def hasBaseChannelAndUpdates():
return _hasBaseChannelAndUpdates
-def validateCaps():
- """If the server doesn't support the needed capabilities, informs the user
- and returns True. If it does, returns False. This is kinda backwards, but I
- wanted it to work the same way as most of the other calls.
-
- """
- setBusyCursor()
- setArrowCursor()
- return False
-
-
def setBusyCursor():
"""Dummy function that will be overidden by rhn_register's standalone gui
and firstboot in different ways.
commit 8e10c995bfa507888279aa006a2e9dcc4e2f4a7f
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Wed Mar 17 15:40:15 2010 +0100
Remove serverSupportsRhelFiveCalls: just assume the server supports RHEL 5 calls by now.
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 5ac55d8..169b610 100644
--- a/client/rhel/rhn-client-tools/src/up2date_client/rhnreg.py
+++ b/client/rhel/rhn-client-tools/src/up2date_client/rhnreg.py
@@ -847,34 +847,6 @@ def getPossibleOrgs(username, password, useCache=False):
return cachedOrgs
-def serverSupportsRhelFiveCalls():
- """This checks for the new calls we added for rhel 5, some of which
- are required, such as the new system registration calls. I don't know how
- this will work long term, but for now we wanna put this into a build that
- people will probably try to use against servers that don't support the new
- stuff.
- TODO List calls here.
-
- Returns True or False.
-
- """
- # This is a hack.
- # TODO Call new_system_user_pass instead of getPossibleOrg so it works on sats.
- # TODO Make this use nice capabilities infrastructure or something.
- # We only check for get_possible_orgs but we're really also checking for the
- # other calls that were added at the same time.
- try:
- getPossibleOrgs('sdthzdthz233drgdth', 'ztedhzdth2zdbz')
- except up2dateErrors.ValidationError:
- return True
- except up2dateErrors.UnknownMethodException:
- pass
- except:
- log.log_me("An unexcepted error was raised while checking to see if the"
- " server supports the required calls:")
- log.log_exception(*sys.exc_info())
- return False
-
def spawnRhnCheckForUI():
if os.access("/usr/sbin/rhn_check", os.R_OK|os.X_OK):
from subprocess import Popen, PIPE
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 ce25c52..643e9cf 100644
--- a/client/rhel/rhn-client-tools/src/up2date_client/rhnregGui.py
+++ b/client/rhel/rhn-client-tools/src/up2date_client/rhnregGui.py
@@ -1783,13 +1783,8 @@ def validateCaps():
"""
setBusyCursor()
- if rhnreg.serverSupportsRhelFiveCalls():
- setArrowCursor()
- return False
- else:
- setArrowCursor()
- errorWindow(rhnreg_constants.SERVER_TOO_OLD)
- return True
+ setArrowCursor()
+ return False
def setBusyCursor():
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 0f03a35..46b75e4 100644
--- a/client/rhel/rhn-client-tools/src/up2date_client/tui.py
+++ b/client/rhel/rhn-client-tools/src/up2date_client/tui.py
@@ -146,15 +146,6 @@ class ConnectWindow:
self.screen.popWindow()
- # Next, test for RHEL 5 compatibility.
- if rhnreg.serverSupportsRhelFiveCalls():
- pass
- else:
- FatalErrorWindow(self.screen,
- _("The server you are attempting "
- "to register against does not support this "
- "version of the client."))
-
# Just return next, although the user wouldn't have actually pressed
# anything.
return "next"
14 years, 2 months