Changes to 'refs/tags/spacewalk-schema-1.1.21-1'
by Michael Mraka
Tag 'spacewalk-schema-1.1.21-1' created by Michael Mraka <michael.mraka(a)redhat.com> at 2010-07-27 12:06 +0000
Tagging package [spacewalk-schema] version [1.1.21-1] in directory [schema/spacewalk/].
Changes since spacewalk-java-1.1.36-1:
Justin Sherrill (2):
616267 - fixing issue where system.listPackages api call would return nothing if the client had not uploaded the arch for the installed packages (older rhel 4 clients)
582646 - making spacewalk-remove-channel communicate better about what child channels a channel has
Michael Mraka (2):
618219 - fixed boundary condition
Automatic commit of package [spacewalk-schema] release [1.1.21-1].
Milan Zazrivec (3):
617425 - add missing 'the's
618219 - if expects an expression
618219 - use last_channel_org_id in update_family_counts
Miroslav Suchý (1):
618267 - encode latin-1 characters to unicode
---
backend/satellite_tools/spacewalk-remove-channel | 38 ++++++----
client/rhel/rhn-client-tools/data/rh_register.glade | 8 +-
client/rhel/rhn-client-tools/src/up2date_client/rhnreg.py | 23 ++++++
java/code/src/com/redhat/rhn/common/db/datasource/xml/System_queries.xml | 10 +-
java/code/src/com/redhat/rhn/manager/system/SystemManager.java | 8 +-
rel-eng/packages/spacewalk-schema | 2
schema/spacewalk/oracle/packages/rhn_channel.pkb | 10 +-
schema/spacewalk/spacewalk-schema.spec | 5 +
8 files changed, 75 insertions(+), 29 deletions(-)
---
13 years, 8 months
rel-eng/packages schema/spacewalk
by Michael Mraka
rel-eng/packages/spacewalk-schema | 2 +-
schema/spacewalk/spacewalk-schema.spec | 5 ++++-
2 files changed, 5 insertions(+), 2 deletions(-)
New commits:
commit 6b974012e53f5a0e4c54a0a5a7e10397298b3d19
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Tue Jul 27 14:06:54 2010 +0200
Automatic commit of package [spacewalk-schema] release [1.1.21-1].
diff --git a/rel-eng/packages/spacewalk-schema b/rel-eng/packages/spacewalk-schema
index ad5d24a..00a376d 100644
--- a/rel-eng/packages/spacewalk-schema
+++ b/rel-eng/packages/spacewalk-schema
@@ -1 +1 @@
-1.1.20-1 schema/spacewalk/
+1.1.21-1 schema/spacewalk/
diff --git a/schema/spacewalk/spacewalk-schema.spec b/schema/spacewalk/spacewalk-schema.spec
index 17bbcc3..8c63b48 100644
--- a/schema/spacewalk/spacewalk-schema.spec
+++ b/schema/spacewalk/spacewalk-schema.spec
@@ -2,7 +2,7 @@ Name: spacewalk-schema
Group: Applications/Internet
Summary: Oracle SQL schema for Spacewalk server
-Version: 1.1.20
+Version: 1.1.21
Release: 1%{?dist}
Source0: %{name}-%{version}.tar.gz
@@ -59,6 +59,9 @@ rm -rf $RPM_BUILD_ROOT
%{_mandir}/man1/spacewalk-schema-upgrade*
%changelog
+* Tue Jul 27 2010 Michael Mraka <michael.mraka(a)redhat.com> 1.1.21-1
+- 618219 - more fixes
+
* Mon Jul 26 2010 Michael Mraka <michael.mraka(a)redhat.com> 1.1.20-1
- 618219 - update family counts only once per family
13 years, 8 months
schema/spacewalk
by Michael Mraka
schema/spacewalk/oracle/packages/rhn_channel.pkb | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
New commits:
commit de569f8b9fd153ce3f300f58bb288d0bf2f8d5b0
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Tue Jul 27 13:58:43 2010 +0200
618219 - fixed boundary condition
(i.e. don't update counts on the very first row)
diff --git a/schema/spacewalk/oracle/packages/rhn_channel.pkb b/schema/spacewalk/oracle/packages/rhn_channel.pkb
index 944ae06..00de6e5 100644
--- a/schema/spacewalk/oracle/packages/rhn_channel.pkb
+++ b/schema/spacewalk/oracle/packages/rhn_channel.pkb
@@ -439,7 +439,9 @@ IS
and channel.channel_family_id != last_channel_family_id then
-- update family counts only once
-- after all channels with same family has been fetched
- update_family_counts(last_channel_family_id, last_channel_org_id);
+ if last_channel_family_id != -1 then
+ update_family_counts(last_channel_family_id, last_channel_org_id);
+ end if;
last_channel_family_id := channel.channel_family_id;
last_channel_org_id := channel.org_id;
end if;
13 years, 8 months
client/rhel
by Miroslav Suchý
client/rhel/rhn-client-tools/src/up2date_client/rhnreg.py | 23 ++++++++++++++
1 file changed, 23 insertions(+)
New commits:
commit 6f7c1cd5714b536d10d78273645ba6f5779ed3f8
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Mon Jul 26 17:46:35 2010 +0200
618267 - encode latin-1 characters to unicode
E.g. Microsoft Natural Keyboard reports in int name Natural(r) with
(r) as character \xae. All such character above ord(127) make problem
during xmlrpc comunication, we need to convert them all to unicode.
Since it is gathered from dozen of places in 3 different modules, I
decided to convert them just before sending, as converting them individually
one by one at the place, where we gathered it from gudev, ethtool, kudzu, hal...
will be error prone.
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 fdaa0eb..db077c6 100644
--- a/client/rhel/rhn-client-tools/src/up2date_client/rhnreg.py
+++ b/client/rhel/rhn-client-tools/src/up2date_client/rhnreg.py
@@ -539,6 +539,28 @@ class ActivationResult:
"""Returns a dict- the key/value pairs are label/quantity."""
return self._systemSlots
+def _encode_characters(*args):
+ """ All the data we gathered from dmi, bios, gudev are in latin-1,
+ we need to convert characters beyond ord(127) - e.g \xae to unicode.
+ """
+ result=[]
+ for item in args:
+ item_type = type(item)
+ if item_type == StringType or item_type == UnicodeType:
+ item = unicode(item, 'latin-1')
+ elif item_type == TupleType:
+ item = tuple(map(_encode_characters, item))
+ elif item_type == ListType:
+ item = map(_encode_characters, item)
+ elif item_type == DictType or item_type == DictionaryType:
+ item = dict([(_encode_characters(name, val)) for name, val in item.iteritems()])
+ # else: numbers - are safe
+ result.append(item)
+ if len(result) == 1:
+ return result[0]
+ else:
+ return tuple(result)
+
def _activate_hardware(login, password):
# Read the asset code from the hardware.
@@ -547,6 +569,7 @@ def _activate_hardware(login, password):
hw_activation_code = None
try:
hardwareInfo = hardware.get_hal_system_and_smbios()
+ hardwareInfo = _encode_characters(hardwareInfo)
except:
log.log_me("There was an error while reading the hardware "
"info from the bios. Traceback:\n")
13 years, 8 months
2 commits - schema/spacewalk
by Milan Zazrivec
schema/spacewalk/oracle/packages/rhn_channel.pkb | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
New commits:
commit ff2714abbe25734d6259e1f9d14a7e67667cb808
Author: Milan Zazrivec <mzazrivec(a)redhat.com>
Date: Tue Jul 27 12:31:34 2010 +0200
618219 - use last_channel_org_id in update_family_counts
This is to avoid schema population error: PLS-00201: identifier
'CHANNEL.ORG_ID' must be declared
diff --git a/schema/spacewalk/oracle/packages/rhn_channel.pkb b/schema/spacewalk/oracle/packages/rhn_channel.pkb
index 75b72ee..944ae06 100644
--- a/schema/spacewalk/oracle/packages/rhn_channel.pkb
+++ b/schema/spacewalk/oracle/packages/rhn_channel.pkb
@@ -446,7 +446,7 @@ IS
end loop channel;
if update_family_countsYN > 0 and last_channel_family_id != -1 then
-- update the last family fetched
- update_family_counts(last_channel_family_id, channel.org_id);
+ update_family_counts(last_channel_family_id, last_channel_org_id);
end if;
END clear_subscriptions;
commit 9a3dc0641c5299f605290867d7263c9b946398c9
Author: Milan Zazrivec <mzazrivec(a)redhat.com>
Date: Tue Jul 27 12:17:22 2010 +0200
618219 - if expects an expression
This is to avoid population errors: PLS-00382: expression is of wrong type
diff --git a/schema/spacewalk/oracle/packages/rhn_channel.pkb b/schema/spacewalk/oracle/packages/rhn_channel.pkb
index b4046bf..75b72ee 100644
--- a/schema/spacewalk/oracle/packages/rhn_channel.pkb
+++ b/schema/spacewalk/oracle/packages/rhn_channel.pkb
@@ -435,7 +435,7 @@ IS
for channel in server_channels(server_id_in)
loop
unsubscribe_server(server_id_in, channel.channel_id, 1, 1, deleting_server, 0);
- if update_family_countsYN
+ if update_family_countsYN > 0
and channel.channel_family_id != last_channel_family_id then
-- update family counts only once
-- after all channels with same family has been fetched
@@ -444,7 +444,7 @@ IS
last_channel_org_id := channel.org_id;
end if;
end loop channel;
- if update_family_countsYN and last_channel_family_id != -1 then
+ if update_family_countsYN > 0 and last_channel_family_id != -1 then
-- update the last family fetched
update_family_counts(last_channel_family_id, channel.org_id);
end if;
13 years, 8 months
client/rhel
by Milan Zazrivec
client/rhel/rhn-client-tools/data/rh_register.glade | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
New commits:
commit f9ea0110a7d54c4f0a26e4bbee94014187b89b62
Author: Milan Zazrivec <mzazrivec(a)redhat.com>
Date: Tue Jul 27 10:24:15 2010 +0200
617425 - add missing 'the's
diff --git a/client/rhel/rhn-client-tools/data/rh_register.glade b/client/rhel/rhn-client-tools/data/rh_register.glade
index 37a1dce..6fa37f7 100644
--- a/client/rhel/rhn-client-tools/data/rh_register.glade
+++ b/client/rhel/rhn-client-tools/data/rh_register.glade
@@ -89,8 +89,8 @@
To keep your system updated, secure, and supported, please register this system at your earliest convenience.
-You may access RHN registration tool by running <b>RHN Registration</b> in the <b>System > Administration</b> menu.
-You may access software update tool by running <b>Software Update</b> in the <b>System > Administration</b> menu.</property>
+You may access the RHN registration tool by running <b>RHN Registration</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>
<property name="use_underline">False</property>
<property name="use_markup">True</property>
<property name="justify">GTK_JUSTIFY_LEFT</property>
@@ -3443,8 +3443,8 @@ A security certificate, using SSL technology, is necessary to ensure that data c
<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.
-You may access RHN registration tool by running <b>RHN Registration</b> in the <b>System > Administration</b> menu.
-You may access software update tool by running <b>Software Update</b> in the <b>System > Administration</b> menu.</property>
+You may access the RHN registration tool by running <b>RHN Registration</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>
<property name="use_underline">False</property>
<property name="use_markup">True</property>
<property name="justify">GTK_JUSTIFY_LEFT</property>
13 years, 8 months
backend/satellite_tools
by Justin Sherrill
backend/satellite_tools/spacewalk-remove-channel | 38 +++++++++++++++--------
1 file changed, 25 insertions(+), 13 deletions(-)
New commits:
commit 5f7dad66761b7c28e18968ea9a54e2515c68d793
Author: Justin Sherrill <jsherril(a)redhat.com>
Date: Mon Jul 26 17:54:42 2010 -0400
582646 - making spacewalk-remove-channel communicate better about what child channels a channel has
diff --git a/backend/satellite_tools/spacewalk-remove-channel b/backend/satellite_tools/spacewalk-remove-channel
index 36b263f..88e94aa 100755
--- a/backend/satellite_tools/spacewalk-remove-channel
+++ b/backend/satellite_tools/spacewalk-remove-channel
@@ -92,12 +92,12 @@ def main():
dict_label, dict_parents = __listChannels()
if options.list:
- lbls = []
- for c in dict_label.keys():
- lbls.append(c)
- lbls.sort()
- for c in lbls:
- print c
+ keys = dict_parents.keys()
+ keys.sort()
+ for c in keys:
+ print c
+ for sub in dict_parents[c]:
+ print "\t" + sub
return
@@ -106,6 +106,7 @@ def main():
for channel in options.channel:
channels[channel] = None
+ child_test_fail = False
for channel in channels.keys():
if not dict_label.has_key(channel):
print "Unknown channel %s" % channel
@@ -115,12 +116,20 @@ def main():
if not dict_parents.has_key(channel):
continue
# this channel is a parent channel?
+ children = []
for subch in dict_parents[channel]:
if not channels.has_key(subch):
- print "Error: cannot remove channel %s: subchannel %s exists" %(
- channel, subch)
- return -1
-
+ child_test_fail = True
+ children.append(subch)
+ if children:
+ print "Error: cannot remove channel %s: subchannel(s) exist: " %(
+ channel)
+ for child in children:
+ print "\t\t\t" + child
+
+ if child_test_fail:
+ return -1
+
if __serverCheck(channels.keys(), options.unsubscribe):
return -1
@@ -253,7 +262,9 @@ def __listChannels():
sql = """
select c1.label, c2.label parent_channel
from rhnChannel c1, rhnChannel c2
- where c1.parent_channel = c2.id (+)
+ where c1.parent_channel = c2.id (+) and
+ (C1.org_id is null or C2.org_id is null)
+ order by c2.label desc, c1.label asc
"""
h = rhnSQL.prepare(sql)
h.execute()
@@ -265,9 +276,10 @@ def __listChannels():
break
parent_channel = row['parent_channel']
labels[row['label']] = parent_channel
+ if not parent_channel:
+ parents[row['label']] = []
+
if parent_channel:
- if not parents.has_key(parent_channel):
- parents[parent_channel] = []
parents[parent_channel].append(row['label'])
return labels, parents
13 years, 8 months
java/code
by Justin Sherrill
java/code/src/com/redhat/rhn/common/db/datasource/xml/System_queries.xml | 10 +++++-----
java/code/src/com/redhat/rhn/manager/system/SystemManager.java | 8 +++++++-
2 files changed, 12 insertions(+), 6 deletions(-)
New commits:
commit 5c8acab5438496c77ea1dda2c4e2ec02e5c60efd
Author: Justin Sherrill <jsherril(a)redhat.com>
Date: Mon Jul 26 15:25:55 2010 -0400
616267 - fixing issue where system.listPackages api call would return nothing if the client had not uploaded the arch for the installed packages (older rhel 4 clients)
diff --git a/java/code/src/com/redhat/rhn/common/db/datasource/xml/System_queries.xml b/java/code/src/com/redhat/rhn/common/db/datasource/xml/System_queries.xml
index 35b3d85..d1032ab 100644
--- a/java/code/src/com/redhat/rhn/common/db/datasource/xml/System_queries.xml
+++ b/java/code/src/com/redhat/rhn/common/db/datasource/xml/System_queries.xml
@@ -1284,14 +1284,14 @@ ORDER BY UPPER(S.name)
SELECT PN.name,
PE.version,
PE.release,
- NVL(PE.epoch, ' ') as epoch,
+ coalesce(PE.epoch, ' ') as epoch,
PA.name as arch,
SP.installtime
- FROM rhnPackageName PN, rhnPackageEVR PE, rhnServerPackage SP, rhnPackageArch PA
+ FROM rhnServerPackage SP inner join
+ rhnPackageName PN on PN.id = SP.name_id inner join
+ rhnPackageEVR PE on PE.id = SP.evr_id left join
+ rhnPackageArch PA on SP.package_arch_id = PA.id
WHERE SP.server_id = :sid
- AND PN.id = SP.name_id
- AND PE.id = SP.evr_id
- AND PA.id = SP.package_arch_id
ORDER BY PN.name, PE.evr
</query>
</mode>
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 2092303..1bb9557 100644
--- a/java/code/src/com/redhat/rhn/manager/system/SystemManager.java
+++ b/java/code/src/com/redhat/rhn/manager/system/SystemManager.java
@@ -230,7 +230,13 @@ public class SystemManager extends BaseManager {
Map.class);
Map params = new HashMap();
params.put("sid", sid);
- return m.execute(params);
+ DataResult<Map> pkgs = m.execute(params);
+ for (Map pkg : pkgs) {
+ if (pkg.get("arch") == null) {
+ pkg.put("arch", LocalizationService.getInstance().getMessage("Unknown"));
+ }
+ }
+ return pkgs;
}
/**
13 years, 8 months
Changes to 'refs/tags/spacewalk-java-1.1.36-1'
by Tomas Lestach
Tag 'spacewalk-java-1.1.36-1' created by Tomas Lestach <tlestach(a)redhat.com> at 2010-07-26 17:49 +0000
Tagging package [spacewalk-java] version [1.1.36-1] in directory [java/].
Changes since osad-5.9.37-1:
Aron Parsons (5):
allow filtering in report_errata
added new API call schedule.rescheduleActions
add counts for the number of completed/failed/inprogress systems to the ScheduledAction DTO and schedule.list*Actions API calls
added new API call system.listLatestAvailablePackage that will list the latest available version of a package for each system in the list
alter the return type of system.listLatestAvailablePackage
Tomas Lestach (1):
Automatic commit of package [spacewalk-java] release [1.1.36-1].
---
java/code/src/com/redhat/rhn/common/db/datasource/xml/Action_queries.xml | 25 ++-
java/code/src/com/redhat/rhn/frontend/dto/ScheduledAction.java | 51 ++++++
java/code/src/com/redhat/rhn/frontend/xmlrpc/schedule/ScheduleHandler.java | 31 ++++
java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/ScheduleActionSerializer.java | 6
java/code/src/com/redhat/rhn/frontend/xmlrpc/system/SystemHandler.java | 74 ++++++++++
java/spacewalk-java.spec | 12 +
rel-eng/packages/spacewalk-java | 2
spacecmd/src/lib/report.py | 15 +-
8 files changed, 203 insertions(+), 13 deletions(-)
---
13 years, 8 months
java/spacewalk-java.spec rel-eng/packages
by Tomas Lestach
java/spacewalk-java.spec | 12 +++++++++++-
rel-eng/packages/spacewalk-java | 2 +-
2 files changed, 12 insertions(+), 2 deletions(-)
New commits:
commit 4bd404d2127a0fe59484248ee9fac6567be30651
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Mon Jul 26 19:49:19 2010 +0200
Automatic commit of package [spacewalk-java] release [1.1.36-1].
diff --git a/java/spacewalk-java.spec b/java/spacewalk-java.spec
index 5f80af8..8dd298e 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: 1.1.35
+Version: 1.1.36
Release: 1%{?dist}
URL: https://fedorahosted.org/spacewalk
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
@@ -321,6 +321,16 @@ fi
%{jardir}/postgresql-jdbc.jar
%changelog
+* Mon Jul 26 2010 Tomas Lestach <tlestach(a)redhat.com> 1.1.36-1
+- alter the return type of system.listLatestAvailablePackage
+ (aparsons(a)redhat.com)
+- added new API call system.listLatestAvailablePackage that will list the
+ latest available version of a package for each system in the list
+ (aparsons(a)redhat.com)
+- add counts for the number of completed/failed/inprogress systems to the
+ ScheduledAction DTO and schedule.list*Actions API calls (aparsons(a)redhat.com)
+- added new API call schedule.rescheduleActions (aparsons(a)redhat.com)
+
* Fri Jul 23 2010 Michael Mraka <michael.mraka(a)redhat.com> 1.1.35-1
- fixing new connection stuff to allow for the thin client
- Add system migration to webUI
diff --git a/rel-eng/packages/spacewalk-java b/rel-eng/packages/spacewalk-java
index 7ec9868..9675e77 100644
--- a/rel-eng/packages/spacewalk-java
+++ b/rel-eng/packages/spacewalk-java
@@ -1 +1 @@
-1.1.35-1 java/
+1.1.36-1 java/
13 years, 8 months