client/rhel
by Jan Pazdziora
client/rhel/rhn-client-tools/src/up2date_client/rhnreg.py | 8 ++------
1 file changed, 2 insertions(+), 6 deletions(-)
New commits:
commit 97d3b6a8eed9151da9a01262cbe213a6d93c7e2f
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Mon Mar 29 14:28:59 2010 +0200
registerUser no longer invoked with email, removing this parameter.
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 08e0338..b4f3a93 100644
--- a/client/rhel/rhn-client-tools/src/up2date_client/rhnreg.py
+++ b/client/rhel/rhn-client-tools/src/up2date_client/rhnreg.py
@@ -279,13 +279,9 @@ def reserveUser(username, password):
return s.registration.reserve_user(username, password)
-def registerUser(username, password, email = None):
+def registerUser(username, password):
s = rhnserver.RhnServer()
-
- if not email == None:
- s.registration.new_user(username, password, email)
- else:
- s.registration.new_user(username, password)
+ s.registration.new_user(username, password)
class RegistrationResult:
14 years, 1 month
client/rhel
by Jan Pazdziora
client/rhel/rhn-client-tools/src/up2date_client/tui.py | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
New commits:
commit 29818e89195deeb028d679bb1b120d9c410b1a4c
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Mon Mar 29 14:28:04 2010 +0200
Email never user nor specified in TUI, 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 33bed47..9a0a613 100644
--- a/client/rhel/rhn-client-tools/src/up2date_client/tui.py
+++ b/client/rhel/rhn-client-tools/src/up2date_client/tui.py
@@ -802,7 +802,7 @@ class FinishWindow:
# send the data
try:
- rhnreg.registerUser(tui.userName, tui.password, tui.email)
+ rhnreg.registerUser(tui.userName, tui.password)
except up2dateErrors.CommunicationError, e:
FatalErrorWindow(self.screen, _("Problem registering login name:\n") + e.errmsg)
except:
@@ -1126,7 +1126,6 @@ class Tui:
def initResults(self):
self.userName = ""
self.password = ""
- self.email = ""
self.oemInfo = {}
self.productInfo = {
14 years, 1 month
client/rhel
by Jan Pazdziora
client/rhel/rhn-client-tools/src/up2date_client/tui.py | 2 --
1 file changed, 2 deletions(-)
New commits:
commit a560adbfb942e63b6f468cf4a9be11dfe4b092b2
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Mon Mar 29 12:19:17 2010 +0200
Drop comment which is no longer applicable.
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 8d6ba4b..33bed47 100644
--- a/client/rhel/rhn-client-tools/src/up2date_client/tui.py
+++ b/client/rhel/rhn-client-tools/src/up2date_client/tui.py
@@ -1285,8 +1285,6 @@ class Tui:
index = index - 1
continue
- # Don't offer group selection screen if the user is not
- # a member of multiple groups.
log.log_debug("index is %s" % index)
result = win.run()
14 years, 1 month
client/rhel
by Jan Pazdziora
client/rhel/rhn-client-tools/src/up2date_client/tui.py | 20 +----------------
1 file changed, 2 insertions(+), 18 deletions(-)
New commits:
commit 56477190483ceb5ba483089aa8df0d9ac4d484df
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Mon Mar 29 12:17:28 2010 +0200
Cleanup all remaining skipping in Tui class.
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 be1a375..8d6ba4b 100644
--- a/client/rhel/rhn-client-tools/src/up2date_client/tui.py
+++ b/client/rhel/rhn-client-tools/src/up2date_client/tui.py
@@ -1292,27 +1292,11 @@ class Tui:
result = win.run()
if result == "back":
-
- # hardware window
- if win.name == 'HardwareWindow': # and self.alreadyRegistered:
-
- # If we saw the sub window, go back 1
- if self.saw_sub_window == 1:
- index = index - 1
- # Else, we must not have seen either go back 3
- else:
- index = index - 4
-
- elif win.name == 'OSReleaseWindow':
- if self.saw_sub_window == 1:
- index = index - 1
- # Else, we must not have seen either go back 3
- else:
- index = index - 3
- else:
+ if index > 0:
index = index - 1
direction = "backward"
+
elif result == "cancel":
log.log_debug("Caught a cancel request")
14 years, 1 month
client/rhel
by Jan Pazdziora
client/rhel/rhn-client-tools/src/up2date_client/tui.py | 20 +++++------------
1 file changed, 6 insertions(+), 14 deletions(-)
New commits:
commit d4d85ea3b8d9d60fa02e55b5ff8db61b2bdc59a0
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Fri Mar 26 16:49:32 2010 +0100
Move another skipping logic for no EUS channels to the OSReleaseWindow class.
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 9dae532..be1a375 100644
--- a/client/rhel/rhn-client-tools/src/up2date_client/tui.py
+++ b/client/rhel/rhn-client-tools/src/up2date_client/tui.py
@@ -393,6 +393,12 @@ class OSReleaseWindow:
log.log_debug("Server does not support EUS, skipping OSReleaseWindow")
raise WindowSkipException()
+ self.available_channels = rhnreg.getAvailableChannels(
+ tui.userName, tui.password)
+ if len(self.available_channels['channels']) < 1:
+ log.log_debug("No available EUS channels, skipping OSReleaseWindow")
+ raise WindowSkipException()
+
self.name = "OSReleaseWindow"
self.screen = screen
self.tui = tui
@@ -426,9 +432,6 @@ class OSReleaseWindow:
width = self.size[0]-10)
toplevel.add(self.channelList, 0, 5)
- self.available_channels = rhnreg.getAvailableChannels(
- self.tui.userName, self.tui.password)
-
for key, value in self.available_channels['channels'].items():
if key in self.available_channels['receiving_updates']:
value = value + "*"
@@ -1286,17 +1289,6 @@ class Tui:
# a member of multiple groups.
log.log_debug("index is %s" % index)
- if win.name == 'OSReleaseWindow':
- channels = rhnreg.getAvailableChannels(self.userName,
- self.password)
- # If user is not entitled to eus channels or
- # if no eus channels are available skip the
- # choose channel screen
- channels = channels['channels']
- if not rhnreg.server_supports_eus() or len(channels) < 1:
- index = index + 1
- continue
-
result = win.run()
if result == "back":
14 years, 1 month
client/rhel
by Jan Pazdziora
client/rhel/rhn-client-tools/src/up2date_client/tui.py | 30 +++++++++++++----
1 file changed, 23 insertions(+), 7 deletions(-)
New commits:
commit 02c01d34a228c99f81aa57786b565d4a3d133793
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Mon Mar 29 12:05:18 2010 +0200
If the window is to be skipped, it should raise WindowSkipException in constructor.
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 c015894..9dae532 100644
--- a/client/rhel/rhn-client-tools/src/up2date_client/tui.py
+++ b/client/rhel/rhn-client-tools/src/up2date_client/tui.py
@@ -92,6 +92,11 @@ def tui_call_wrapper(screen, func, *params):
return results
+class WindowSkipException:
+
+ def __init__(self):
+ pass
+
class ConnectWindow:
def __init__(self, screen, tui):
@@ -383,6 +388,11 @@ class InfoWindow:
class OSReleaseWindow:
def __init__(self, screen, tui):
+
+ if not rhnreg.server_supports_eus():
+ log.log_debug("Server does not support EUS, skipping OSReleaseWindow")
+ raise WindowSkipException()
+
self.name = "OSReleaseWindow"
self.screen = screen
self.tui = tui
@@ -1256,19 +1266,22 @@ class Tui:
log.log_debug("Running %s" % self.__class__.__name__)
self.initResults()
+ direction = "forward"
+
try:
index = 0
while index < len(self.windows):
- # check if we support eus before calling the instance
- if self.windows[index].__name__ == 'OSReleaseWindow':
- if not rhnreg.server_supports_eus():
- log.log_debug("skipping osrelease window")
+ win = None
+ try:
+ win = self.windows[index](self.screen, self)
+ except WindowSkipException:
+ if direction == "forward":
index = index + 1
- continue
+ else:
+ index = index - 1
+ continue
- win = self.windows[index](self.screen, self)
-
# Don't offer group selection screen if the user is not
# a member of multiple groups.
log.log_debug("index is %s" % index)
@@ -1306,6 +1319,8 @@ class Tui:
index = index - 3
else:
index = index - 1
+
+ direction = "backward"
elif result == "cancel":
log.log_debug("Caught a cancel request")
@@ -1316,6 +1331,7 @@ class Tui:
elif result == "next":
index = index + 1
win.saveResults()
+ direction = "forward"
finally:
self.screen.finish()
14 years, 1 month
client/rhel
by Jan Pazdziora
client/rhel/rhn-client-tools/src/up2date_client/tui.py | 5 -----
1 file changed, 5 deletions(-)
New commits:
commit 5789ed41a03767b77dbc6429a4fdb0e5d2afafdd
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Fri Mar 26 15:49:12 2010 +0100
WarningWindow never used, 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 11e5c9c..c015894 100644
--- a/client/rhel/rhn-client-tools/src/up2date_client/tui.py
+++ b/client/rhel/rhn-client-tools/src/up2date_client/tui.py
@@ -50,11 +50,6 @@ def RecoverableErrorWindow(screen, errmsg):
snack.ButtonChoiceWindow(screen, RECOVERABLE_ERROR, "%s" % errmsg,
[OK])
-def WarningWindow(screen, errmsg):
- snack.ButtonChoiceWindow(screen, WARNING, "%s" % errmsg,
- [OK])
- screen.finish()
-
def ConfirmQuitWindow(screen):
button = snack.ButtonChoiceWindow(screen, CONFIRM_QUIT,
CONFIRM_QUIT_SURE + "\n" + \
14 years, 1 month
2 commits - client/rhel
by Jan Pazdziora
client/rhel/rhn-client-tools/src/up2date_client/tui.py | 46 -----------------
1 file changed, 46 deletions(-)
New commits:
commit c072ae2f57edecf3f8e564eb000c5c9882e1a890
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Fri Mar 26 15:45:10 2010 +0100
TermsAndConditionsWindow never used, 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 bb88da3..11e5c9c 100644
--- a/client/rhel/rhn-client-tools/src/up2date_client/tui.py
+++ b/client/rhel/rhn-client-tools/src/up2date_client/tui.py
@@ -235,45 +235,6 @@ class WhyRegisterWindow:
return button
-class TermsAndConditionsWindow:
- def __init__(self, screen, tui):
- self.name = "TermsAndConditionsWindow"
- self.screen = screen
- self.tui = tui
- size = snack._snack.size()
- toplevel = snack.GridForm(screen, TERMS_AND_CONDS_WINDOW,
- 1, 2)
-
- try:
- text = """ \n\n\n This is a sample Terms and Conditions. \n\n\n"""
- print "#FIXME"
- # text = rhnreg.termsAndConditions()
- tb = snack.Textbox(size[0]-10, size[1]-14, text, 1)
- except up2dateErrors.CommunicationError, e:
- FatalErrorWindow(screen, e.errmsg)
-
- toplevel.add(tb, 0, 0, padding = (0, 0, 0, 1))
-
- self.bb = snack.ButtonBar(screen,
- [(NEXT, "next"),
- (BACK, "back"),
- (CANCEL, "cancel")])
- toplevel.add(self.bb, 0, 1, growx = 1)
- self.g = toplevel
-
- def saveResults(self):
- pass
-
- def run(self):
- log.log_debug("Running %s" % self.__class__.__name__)
- self.screen.refresh()
- result = self.g.runOnce()
- button = self.bb.buttonPressed(result)
-
- if result == "F12":
- return "next"
- return button
-
class InfoWindow:
def __init__(self, screen, tui):
commit e575539bd7c06f4077839aa9ce74978d6e52e244
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Fri Mar 26 14:43:12 2010 +0100
With removal of OrgGroupWindow, saw_org_window 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 81e93c7..bb88da3 100644
--- a/client/rhel/rhn-client-tools/src/up2date_client/tui.py
+++ b/client/rhel/rhn-client-tools/src/up2date_client/tui.py
@@ -1197,7 +1197,6 @@ class Tui:
self.read_reg_num = None
self.saw_sub_window = 0
- self.saw_org_window = 0
def _activate_IN_on_disk(self, inst_num):
# Activate the #
@@ -1339,9 +1338,6 @@ class Tui:
# If we saw the sub window, go back 1
if self.saw_sub_window == 1:
index = index - 1
- # Else, if we saw the org window, go back 2
- elif self.saw_org_window == 1:
- index = index - 2
# Else, we must not have seen either go back 3
else:
index = index - 4
@@ -1349,9 +1345,6 @@ class Tui:
elif win.name == 'OSReleaseWindow':
if self.saw_sub_window == 1:
index = index - 1
- # Else, if we saw the org window, go back 2
- elif self.saw_org_window == 1:
- index = index - 2
# Else, we must not have seen either go back 3
else:
index = index - 3
14 years, 1 month
3 commits - backend/spacewalk-backend.spec schema/spacewalk
by Michael Mraka
backend/spacewalk-backend.spec | 2
schema/spacewalk/common/data/rhnPackageKey.sql | 5 ++
schema/spacewalk/common/data/rhnPackageProvider.sql | 2
schema/spacewalk/upgrade/spacewalk-schema-0.8-to-spacewalk-schema-0.9/005-1-rhnPackageProvider-data.sql | 6 ++
schema/spacewalk/upgrade/spacewalk-schema-0.8-to-spacewalk-schema-0.9/005-2-rhnPackageKey-data.sql | 23 ++++++++++
5 files changed, 37 insertions(+), 1 deletion(-)
New commits:
commit 0b0aa01748d7ce21f9987524d243c7f6ed26d50f
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Mon Mar 29 10:24:06 2010 +0200
schema upgrade for Spacewalk and Fedora gpg keys
diff --git a/schema/spacewalk/upgrade/spacewalk-schema-0.8-to-spacewalk-schema-0.9/005-1-rhnPackageProvider-data.sql b/schema/spacewalk/upgrade/spacewalk-schema-0.8-to-spacewalk-schema-0.9/005-1-rhnPackageProvider-data.sql
new file mode 100644
index 0000000..1fdb765
--- /dev/null
+++ b/schema/spacewalk/upgrade/spacewalk-schema-0.8-to-spacewalk-schema-0.9/005-1-rhnPackageProvider-data.sql
@@ -0,0 +1,6 @@
+-- Spacewalk
+merge into rhnPackageProvider p
+ using (select 'Spacewalk' name from dual) s
+ on (p.name = s.name)
+ WHEN NOT MATCHED THEN INSERT (id, name)
+ VALUES (rhn_package_provider_id_seq.nextval, s.name);
diff --git a/schema/spacewalk/upgrade/spacewalk-schema-0.8-to-spacewalk-schema-0.9/005-2-rhnPackageKey-data.sql b/schema/spacewalk/upgrade/spacewalk-schema-0.8-to-spacewalk-schema-0.9/005-2-rhnPackageKey-data.sql
new file mode 100644
index 0000000..3ca31ed
--- /dev/null
+++ b/schema/spacewalk/upgrade/spacewalk-schema-0.8-to-spacewalk-schema-0.9/005-2-rhnPackageKey-data.sql
@@ -0,0 +1,23 @@
+-- Fedora 12
+merge into rhnpackagekey k
+ using (select '9d1cc34857bbccba' key_id,
+ lookup_package_key_type('gpg') key_type_id,
+ lookup_package_provider('Fedora') provider_id
+ from dual) s
+ on (k.key_id = s.key_id)
+ WHEN MATCHED THEN UPDATE SET k.key_type_id = s.key_type_id,
+ k.provider_id = s.provider_id
+ WHEN NOT MATCHED THEN INSERT (id, key_id, key_type_id, provider_id)
+ VALUES (rhn_pkey_id_seq.nextval, s.key_id, s.key_type_id, s.provider_id);
+
+-- Spacewalk
+merge into rhnpackagekey k
+ using (select '95423d4e430a1c35' key_id,
+ lookup_package_key_type('gpg') key_type_id,
+ lookup_package_provider('Spacewalk') provider_id
+ from dual) s
+ on (k.key_id = s.key_id)
+ WHEN MATCHED THEN UPDATE SET k.key_type_id = s.key_type_id,
+ k.provider_id = s.provider_id
+ WHEN NOT MATCHED THEN INSERT (id, key_id, key_type_id, provider_id)
+ VALUES (rhn_pkey_id_seq.nextval, s.key_id, s.key_type_id, s.provider_id);
commit ed3efae1dff7f24f153601e94f213abc4e6ad5fb
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Mon Mar 29 09:32:25 2010 +0200
561553 - added Spacewalk into package providers
diff --git a/schema/spacewalk/common/data/rhnPackageKey.sql b/schema/spacewalk/common/data/rhnPackageKey.sql
index f18024a..9c0200d 100644
--- a/schema/spacewalk/common/data/rhnPackageKey.sql
+++ b/schema/spacewalk/common/data/rhnPackageKey.sql
@@ -50,7 +50,12 @@ insert into rhnPackageKey (id, key_id, key_type_id, provider_id) values
insert into rhnPackageKey (id, key_id, key_type_id, provider_id) values
(rhn_pkey_id_seq.nextval, '1dc5c758d22e77f2', lookup_package_key_type('gpg'), lookup_package_provider('Fedora'));
+-- Fedora 12
+insert into rhnPackageKey (id, key_id, key_type_id, provider_id) values
+(rhn_pkey_id_seq.nextval, '9d1cc34857bbccba', lookup_package_key_type('gpg'), lookup_package_provider('Fedora'));
+insert into rhnPackageKey (id, key_id, key_type_id, provider_id) values
+(rhn_pkey_id_seq.nextval, '95423d4e430a1c35', lookup_package_key_type('gpg'), lookup_package_provider('Spacewalk'));
commit;
diff --git a/schema/spacewalk/common/data/rhnPackageProvider.sql b/schema/spacewalk/common/data/rhnPackageProvider.sql
index 0d0f04d..e392857 100644
--- a/schema/spacewalk/common/data/rhnPackageProvider.sql
+++ b/schema/spacewalk/common/data/rhnPackageProvider.sql
@@ -26,6 +26,8 @@ insert into rhnPackageProvider (id, name) values
(rhn_package_provider_id_seq.nextval, 'Suse' );
insert into rhnPackageProvider (id, name) values
(rhn_package_provider_id_seq.nextval, 'Oracle Inc.' );
+insert into rhnPackageProvider (id, name) values
+(rhn_package_provider_id_seq.nextval, 'Spacewalk' );
commit 17f97d96e13b583e71fd578cdab8d2de1cc9e872
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Fri Mar 26 10:57:15 2010 +0100
moved wsgi/__init__.py into primary package (to ba available in proxy)
diff --git a/backend/spacewalk-backend.spec b/backend/spacewalk-backend.spec
index 070fb7a..1acdfd8 100644
--- a/backend/spacewalk-backend.spec
+++ b/backend/spacewalk-backend.spec
@@ -327,6 +327,7 @@ rm -f %{rhnconf}/rhnSecret.py*
# wsgi stuff
%if !( 0%{?rhel} && 0%{?rhel} < 6)
%dir %{rhnroot}/wsgi
+%{rhnroot}/wsgi/__init__.py*
%{rhnroot}/wsgi/wsgiHandler.py*
%{rhnroot}/wsgi/wsgiRequest.py*
%endif
@@ -409,7 +410,6 @@ rm -f %{rhnconf}/rhnSecret.py*
%else
# wsgi stuff
%attr(640,root,apache) %config %{apacheconfd}/zz-spacewalk-server-wsgi.conf
-%{rhnroot}/wsgi/__init__.py*
%{rhnroot}/wsgi/app.py*
%{rhnroot}/wsgi/applet.py*
%{rhnroot}/wsgi/config.py*
14 years, 1 month
Changes to 'refs/tags/spacewalk-java-0.9.13-1'
by Justin Sherrill
Tag 'spacewalk-java-0.9.13-1' created by Justin Sherrill <jsherril(a)redhat.com> at 2010-03-26 18:44 +0000
Tagging package [spacewalk-java] version [0.9.13-1] in directory [java/].
Changes since rhn-client-tools-0.9.8-1:
Jan Pazdziora (2):
Add AuthenticationOrAccountCreationError to the list of errors that we catch "nicely".
If the user does not confirm to quit, we shall return to the same window.
Justin Sherrill (3):
changing cobbler call to use automated user since it could go through taskomatic
576301, 576314 - fixing issues where auto-apply of errata was applying even for systems that did not need the errata and was being scheduled multiple times for systems (once for every channel that contained that errata)
Automatic commit of package [spacewalk-java] release [0.9.13-1].
Miroslav Suchý (1):
576907 - make SystemSnapshots aware of multiarch packages
---
client/rhel/rhn-client-tools/src/bin/rhnreg_ks.py | 3 +
client/rhel/rhn-client-tools/src/up2date_client/tui.py | 3 -
java/code/src/com/redhat/rhn/common/db/datasource/xml/Task_queries.xml | 10 ++----
java/code/src/com/redhat/rhn/domain/kickstart/KickstartRawData.java | 4 +-
java/code/src/com/redhat/rhn/taskomatic/task/errata/ErrataQueueWorker.java | 14 +++++++-
java/spacewalk-java.spec | 16 +++++++++-
rel-eng/packages/spacewalk-java | 2 -
web/html/network/systems/details/history/snapshots/packages.pxt | 7 ++--
web/modules/rhn/RHN/DB/DataSource/xml/Package_queries.xml | 6 +++
web/modules/rhn/RHN/DB/Package.pm | 10 +++---
web/modules/sniglets/Sniglets/ListView/PackageList.pm | 11 +++++-
11 files changed, 62 insertions(+), 24 deletions(-)
---
14 years, 1 month