Changes to 'refs/tags/oracle-xe-selinux-10.2.0.23-1'
by Michael Mraka
Tag 'oracle-xe-selinux-10.2.0.23-1' created by Michael Mraka <michael.mraka(a)redhat.com> at 2011-11-30 09:19 +0000
Tagging package [oracle-xe-selinux] version [10.2.0.23-1] in directory [selinux/oracle-xe-selinux/].
Changes since SputLite-1.6.4-1:
Michael Mraka (4):
cleaned up duplicated code
system user uids are < 1000 on Fedora 16
system user uids are < 1000 on Fedora 16
Automatic commit of package [oracle-xe-selinux] release [10.2.0.23-1].
---
backend/server/handlers/xmlrpc/errata.py | 15 ++++-----------
rel-eng/packages/oracle-xe-selinux | 2 +-
selinux/oracle-xe-selinux/oracle-xe-selinux.spec | 17 +++++++++++++----
3 files changed, 18 insertions(+), 16 deletions(-)
---
12 years, 4 months
2 commits - rel-eng/packages selinux/oracle-xe-selinux
by Michael Mraka
rel-eng/packages/oracle-xe-selinux | 2 +-
selinux/oracle-xe-selinux/oracle-xe-selinux.spec | 7 +++++--
2 files changed, 6 insertions(+), 3 deletions(-)
New commits:
commit 2869fbd93a82c3c9c5933ec48a993e648d3c501a
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Wed Nov 30 10:19:05 2011 +0100
Automatic commit of package [oracle-xe-selinux] release [10.2.0.23-1].
diff --git a/rel-eng/packages/oracle-xe-selinux b/rel-eng/packages/oracle-xe-selinux
index 0c5c689..6c4a872 100644
--- a/rel-eng/packages/oracle-xe-selinux
+++ b/rel-eng/packages/oracle-xe-selinux
@@ -1 +1 @@
-10.2.0.22-1 selinux/oracle-xe-selinux/
+10.2.0.23-1 selinux/oracle-xe-selinux/
diff --git a/selinux/oracle-xe-selinux/oracle-xe-selinux.spec b/selinux/oracle-xe-selinux/oracle-xe-selinux.spec
index 76d7593..eb2f7da 100644
--- a/selinux/oracle-xe-selinux/oracle-xe-selinux.spec
+++ b/selinux/oracle-xe-selinux/oracle-xe-selinux.spec
@@ -5,7 +5,7 @@
%define modulename oracle-xe
Name: oracle-xe-selinux
-Version: 10.2.0.22
+Version: 10.2.0.23
Release: 1%{?dist}
Summary: SELinux policy module supporting Oracle XE
Group: System Environment/Base
@@ -145,6 +145,9 @@ fi
%attr(0755,root,root) %{_sbindir}/%{name}-enable
%changelog
+* Wed Nov 30 2011 Michael Mraka <michael.mraka(a)redhat.com> 10.2.0.23-1
+- system user uids are < 1000 on Fedora 16
+
* Thu Jul 21 2011 Jan Pazdziora 10.2.0.22-1
- Revert "Fedora 15 uses oracledb_port_t instead of oracle_port_t."
commit 124f361b45e92fd052669e3b80e4acb7c9352430
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Wed Nov 30 10:04:58 2011 +0100
system user uids are < 1000 on Fedora 16
diff --git a/selinux/oracle-xe-selinux/oracle-xe-selinux.spec b/selinux/oracle-xe-selinux/oracle-xe-selinux.spec
index 6c36cf7..76d7593 100644
--- a/selinux/oracle-xe-selinux/oracle-xe-selinux.spec
+++ b/selinux/oracle-xe-selinux/oracle-xe-selinux.spec
@@ -87,7 +87,7 @@ rm -rf %{buildroot}
%pre
-%if 0%{fedora} >= 16
+%if 0%{?fedora} >= 16
%define min_uid 1000
%else
%define min_uid 500
12 years, 4 months
2 commits - backend/server selinux/oracle-xe-selinux
by Michael Mraka
backend/server/handlers/xmlrpc/errata.py | 15 ++++-----------
selinux/oracle-xe-selinux/oracle-xe-selinux.spec | 12 +++++++++---
2 files changed, 13 insertions(+), 14 deletions(-)
New commits:
commit d842a9c6c059421a5e3e6fd8b6e9e91fcfabe04d
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Wed Nov 30 10:04:58 2011 +0100
system user uids are < 1000 on Fedora 16
diff --git a/selinux/oracle-xe-selinux/oracle-xe-selinux.spec b/selinux/oracle-xe-selinux/oracle-xe-selinux.spec
index 4f2594d..6c36cf7 100644
--- a/selinux/oracle-xe-selinux/oracle-xe-selinux.spec
+++ b/selinux/oracle-xe-selinux/oracle-xe-selinux.spec
@@ -87,12 +87,18 @@ rm -rf %{buildroot}
%pre
+%if 0%{fedora} >= 16
+%define min_uid 1000
+%else
+%define min_uid 500
+%endif
+
ORACLE_UID=`id -u oracle`
if [ -z "$ORACLE_UID" ] ; then
- echo "The oracle user has to exist with uid < 500 before installing this package."
+ echo "The oracle user has to exist with uid < %{min_uid} before installing this package."
exit 1
-elif [ $ORACLE_UID -ge 500 ] ; then
- echo "The oracle user has to exist with uid < 500 before installing this package."
+elif [ $ORACLE_UID -ge %{min_uid} ] ; then
+ echo "The oracle user has to exist with uid < %{min_uid} before installing this package."
echo "User with uid [$ORACLE_UID] found which is not good."
exit 1
fi
commit 99101d276aa70c351d9c464b4d38844a385651bf
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Tue Nov 29 11:20:19 2011 +0100
cleaned up duplicated code
diff --git a/backend/server/handlers/xmlrpc/errata.py b/backend/server/handlers/xmlrpc/errata.py
index 49d172a..69c96a2 100644
--- a/backend/server/handlers/xmlrpc/errata.py
+++ b/backend/server/handlers/xmlrpc/errata.py
@@ -94,17 +94,7 @@ class Errata(rhnHandler):
and e.id = ce.errata_id
""")
h.execute(name = pkg[0], dist = str(osRel))
- ret = []
- # sanitize the results for display in the clients
- while 1:
- row = h.fetchone_dict()
- if row is None:
- break
- for k in row.keys():
- if row[k] is None:
- row[k] = "N/A"
- ret.append(row)
- return ret
+ return self._sanitize_result(h)
def getPackageErratum(self, system_id, pkg):
""" Clients v2+ - Get errata for a package given [n,v,r,e,a,...] format
@@ -164,6 +154,9 @@ class Errata(rhnHandler):
""") # " emacs sucks
h.execute(name = name, ver = ver, rel = rel, epoch = epoch,
server_id = str(self.server_id))
+ return self._sanitize_result(h)
+
+ def _sanitize_result(self, h):
ret = []
# sanitize the results for display in the clients
while 1:
12 years, 4 months
Changes to 'refs/tags/SputLite-1.6.4-1'
by Jan Pazdziora
Tag 'SputLite-1.6.4-1' created by Jan Pazdziora <jpazdziora(a)redhat.com> at 2011-11-29 17:59 +0000
Tagging package [SputLite] version [1.6.4-1] in directory [monitoring/SputLite/].
Changes since spacewalk-java-1.6.82-1:
Jan Pazdziora (2):
Fixing typo (under / undef).
Automatic commit of package [SputLite] release [1.6.4-1].
Milan Zazrivec (2):
IPv6: don't include ::1 as a valid nameserver addr
IPv6: routines to determine IPv6 address/netmask
Miroslav Suchý (9):
code cleanup - tag rhn-server-hardware-profile is not used anywhere
code cleanup - tag rhn-dmi-info is not used anymore
code cleanup - tag rhn-server-device is not used anymore
code cleanup - tag rhn-server-network-details is not used anymore
code cleanup - callback server_hardware_list_refresh_cb is not used anymore
code cleanup - callback rhn:delete_servers_cb is not used anymore
code cleanup - function ks_session_redir is not used anymore
code cleanup - function addon_entitlements is not used anymore
code cleanup - function base_entitlement is not used anymore
---
client/tools/spacewalk-koan/spacewalkkoan/spacewalkkoan.py | 16
monitoring/SputLite/SputLite.spec | 5
monitoring/SputLite/html/cgi-bin/upload_results.cgi | 2
rel-eng/packages/SputLite | 2
web/modules/sniglets/Sniglets/Servers.pm | 285 -------------
5 files changed, 21 insertions(+), 289 deletions(-)
---
12 years, 4 months
2 commits - monitoring/SputLite rel-eng/packages
by Jan Pazdziora
monitoring/SputLite/SputLite.spec | 5 ++++-
monitoring/SputLite/html/cgi-bin/upload_results.cgi | 2 +-
rel-eng/packages/SputLite | 2 +-
3 files changed, 6 insertions(+), 3 deletions(-)
New commits:
commit d617ca82ca337eeab2b55a07c48a7f24bcfeb6b6
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Tue Nov 29 18:59:22 2011 +0100
Automatic commit of package [SputLite] release [1.6.4-1].
diff --git a/monitoring/SputLite/SputLite.spec b/monitoring/SputLite/SputLite.spec
index 69af4d5..998a889 100644
--- a/monitoring/SputLite/SputLite.spec
+++ b/monitoring/SputLite/SputLite.spec
@@ -5,7 +5,7 @@
%define vardir /var/lib/nocpulse
Name: SputLite
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
-Version: 1.6.3
+Version: 1.6.4
Release: 1%{?dist}
Summary: Command queue processor (Sputnik Lite)
URL: https://fedorahosted.org/spacewalk
@@ -98,6 +98,9 @@ fi
rm -rf $RPM_BUILD_ROOT
%changelog
+* Tue Nov 29 2011 Jan Pazdziora 1.6.4-1
+- Fixing typo (under / undef).
+
* Tue Nov 29 2011 Jan Pazdziora 1.6.3-1
- Correct fix for the vn_rhn_command_queue_execs_stderr constraint issue.
- Revert "postgres seems to reject empty text for stdout and stderr column"
diff --git a/rel-eng/packages/SputLite b/rel-eng/packages/SputLite
index d5f857d..7678f73 100644
--- a/rel-eng/packages/SputLite
+++ b/rel-eng/packages/SputLite
@@ -1 +1 @@
-1.6.3-1 monitoring/SputLite/
+1.6.4-1 monitoring/SputLite/
commit f43de2b9c231938fe138bd253e4b7a01dc37e748
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Tue Nov 29 18:57:09 2011 +0100
Fixing typo (under / undef).
diff --git a/monitoring/SputLite/html/cgi-bin/upload_results.cgi b/monitoring/SputLite/html/cgi-bin/upload_results.cgi
index 3939252..69c5964 100755
--- a/monitoring/SputLite/html/cgi-bin/upload_results.cgi
+++ b/monitoring/SputLite/html/cgi-bin/upload_results.cgi
@@ -113,7 +113,7 @@ sub ProcessInput {
# Truncate to fit into a varchar2(4000)
$value = substr($value, 0, 3996) . '...' if (length($value) > 4000);
- $value = under if $value eq '';
+ $value = undef if $value eq '';
push(@values, "$field = ?");
push(@bindvars, $value);
12 years, 4 months
client/tools
by Milan Zazrivec
client/tools/spacewalk-koan/spacewalkkoan/spacewalkkoan.py | 14 +++++++++++++
1 file changed, 14 insertions(+)
New commits:
commit 11ecc40fb2f8bbacbbd273b652fb84337d0e3a9d
Author: Milan Zazrivec <mzazrivec(a)redhat.com>
Date: Tue Nov 29 18:36:34 2011 +0100
IPv6: routines to determine IPv6 address/netmask
diff --git a/client/tools/spacewalk-koan/spacewalkkoan/spacewalkkoan.py b/client/tools/spacewalk-koan/spacewalkkoan/spacewalkkoan.py
index 5dc8a7f..281e594 100644
--- a/client/tools/spacewalk-koan/spacewalkkoan/spacewalkkoan.py
+++ b/client/tools/spacewalk-koan/spacewalkkoan/spacewalkkoan.py
@@ -48,9 +48,23 @@ def find_host_name():
def find_netmask(device):
return execute("LANG=C ifconfig %s | perl -lne '/Mask:([\d.]+)/ and print $1'" % device)[0]
+def find_netmask6(device):
+ nm6 = execute("LANG=C ifconfig %s | perl -lne '/inet6 addr: [[:xdigit:]:]+\/([\d]+).+Scope:Global/ and print $1'" % device)
+ if nm6:
+ return nm6[0]
+ else:
+ return ""
+
def find_ip(device):
return execute("LANG=C ifconfig %s | perl -lne '/inet addr:([\d.]+)/ and print $1'" % device)[0]
+def find_ip6(device):
+ ip6 = execute("LANG=C ifconfig %s | perl -lne '/inet6 addr: ([[:xdigit:]:]+).+Scope:Global/ and print $1'" % device)
+ if ip6:
+ return ip6[0]
+ else:
+ return ""
+
def find_name_servers():
servers = execute("cat /etc/resolv.conf | perl -lne '/^nameserver\s+(\S+)/ and print $1'")
ret = []
12 years, 4 months
client/tools
by Milan Zazrivec
client/tools/spacewalk-koan/spacewalkkoan/spacewalkkoan.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit da1f6ad259a000ec291b717bae0f55493d00b1ac
Author: Milan Zazrivec <mzazrivec(a)redhat.com>
Date: Tue Nov 29 16:21:57 2011 +0100
IPv6: don't include ::1 as a valid nameserver addr
diff --git a/client/tools/spacewalk-koan/spacewalkkoan/spacewalkkoan.py b/client/tools/spacewalk-koan/spacewalkkoan/spacewalkkoan.py
index be0eac0..5dc8a7f 100644
--- a/client/tools/spacewalk-koan/spacewalkkoan/spacewalkkoan.py
+++ b/client/tools/spacewalk-koan/spacewalkkoan/spacewalkkoan.py
@@ -55,7 +55,7 @@ def find_name_servers():
servers = execute("cat /etc/resolv.conf | perl -lne '/^nameserver\s+(\S+)/ and print $1'")
ret = []
for s in servers:
- if s != "127.0.0.1":
+ if s not in ("127.0.0.1", "::1"):
ret.append(s)
return ret
12 years, 4 months
9 commits - web/modules
by Miroslav Suchý
web/modules/sniglets/Sniglets/Servers.pm | 285 -------------------------------
1 file changed, 285 deletions(-)
New commits:
commit 2047ac78cbbd0f849b6812912909db001e7992ab
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Tue Nov 29 16:04:36 2011 +0100
code cleanup - function base_entitlement is not used anymore
diff --git a/web/modules/sniglets/Sniglets/Servers.pm b/web/modules/sniglets/Sniglets/Servers.pm
index 4e00e3d..86c899f 100644
--- a/web/modules/sniglets/Sniglets/Servers.pm
+++ b/web/modules/sniglets/Sniglets/Servers.pm
@@ -563,20 +563,6 @@ sub server_history_event_details {
return $params{__block__};
}
-sub base_entitlement {
- my $pxt = shift;
- my $server = shift;
-
- my ($base_entitlement) = grep { $_->{IS_BASE} eq 'Y' } $server->entitlements;
-
- if ($base_entitlement) {
- return $pxt->user->org->slot_name($base_entitlement->{LABEL});
- }
- else {
- return "None";
- }
-}
-
sub reboot_server_cb {
my $pxt = shift;
my $sid = $pxt->param('sid');
commit 58b91e4001fd38cd377b72c7d3641ce360aee8f3
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Tue Nov 29 16:03:54 2011 +0100
code cleanup - function addon_entitlements is not used anymore
diff --git a/web/modules/sniglets/Sniglets/Servers.pm b/web/modules/sniglets/Sniglets/Servers.pm
index 3cf794a..4e00e3d 100644
--- a/web/modules/sniglets/Sniglets/Servers.pm
+++ b/web/modules/sniglets/Sniglets/Servers.pm
@@ -577,22 +577,6 @@ sub base_entitlement {
}
}
-sub addon_entitlements {
- my $pxt = shift;
- my $server = shift;
-
- my @system_entitlements = $server->entitlements;
- my @addon_entitlements = grep { $_->{IS_BASE} eq 'N' } @system_entitlements;
-
- @addon_entitlements = map { $pxt->user->org->slot_name($_->{LABEL}) } @addon_entitlements;
-
- unless (@addon_entitlements) {
- push @addon_entitlements, "None";
- }
-
- return join(", ", @addon_entitlements);
-}
-
sub reboot_server_cb {
my $pxt = shift;
my $sid = $pxt->param('sid');
commit 508c3a1abeeb02685b9dd6ab06c5d2d9e88a13f2
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Tue Nov 29 16:02:02 2011 +0100
code cleanup - function ks_session_redir is not used anymore
diff --git a/web/modules/sniglets/Sniglets/Servers.pm b/web/modules/sniglets/Sniglets/Servers.pm
index c628ff4..3cf794a 100644
--- a/web/modules/sniglets/Sniglets/Servers.pm
+++ b/web/modules/sniglets/Sniglets/Servers.pm
@@ -849,24 +849,6 @@ sub server_set_lock_cb {
$pxt->redirect("index.pxt");
}
-sub ks_session_redir {
- my $class = shift;
- my $node = shift;
- my $pxt = shift;
-
- my $sid = $pxt->param('sid');
- throw 'no sid' unless $sid;
-
- my $session = RHN::Kickstart::Session->lookup(-sid => $sid, -org_id => $pxt->user->org_id, -soft => 1);
- my $state = $session ? $session->session_state_label : '';
-
- if ($session and $state ne 'complete' and $state ne 'failed') {
- $pxt->redirect('/network/systems/details/kickstart/session_status.pxt?sid=' . $sid);
- }
-
- return;
-}
-
sub remote_command_form {
my $pxt = shift;
my %attr = @_;
commit a88acbd4707c40a87018f5af1ce6ffc667c8c5d6
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Tue Nov 29 14:57:41 2011 +0100
code cleanup - callback rhn:delete_servers_cb is not used anymore
and the function itself has been already deleted in commit a24465ef84a4592798cc82b53b6d5ca27930d480
diff --git a/web/modules/sniglets/Sniglets/Servers.pm b/web/modules/sniglets/Sniglets/Servers.pm
index 2dccd95..c628ff4 100644
--- a/web/modules/sniglets/Sniglets/Servers.pm
+++ b/web/modules/sniglets/Sniglets/Servers.pm
@@ -79,8 +79,6 @@ sub register_callbacks {
$pxt->register_callback('rhn:ssm_change_system_prefs_cb' => \&ssm_change_system_prefs_cb);
- $pxt->register_callback('rhn:delete_servers_cb' => \&delete_servers_cb);
-
$pxt->register_callback('rhn:system-activation-key-cb' => \&system_activation_key_cb);
$pxt->register_callback('rhn:server_set_lock_cb' => \&server_set_lock_cb);
commit 7ed2d0c1eb7d3e7bd3568a29b65dc2de8a58ec0a
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Tue Nov 29 14:54:24 2011 +0100
code cleanup - callback server_hardware_list_refresh_cb is not used anymore
diff --git a/web/modules/sniglets/Sniglets/Servers.pm b/web/modules/sniglets/Sniglets/Servers.pm
index cb26efb..2dccd95 100644
--- a/web/modules/sniglets/Sniglets/Servers.pm
+++ b/web/modules/sniglets/Sniglets/Servers.pm
@@ -77,8 +77,6 @@ sub register_callbacks {
$pxt->register_callback('rhn:server_prefs_form_cb' => \&server_prefs_form_cb);
- $pxt->register_callback('rhn:server_hardware_list_refresh_cb' => \&server_hardware_list_refresh_cb);
-
$pxt->register_callback('rhn:ssm_change_system_prefs_cb' => \&ssm_change_system_prefs_cb);
$pxt->register_callback('rhn:delete_servers_cb' => \&delete_servers_cb);
@@ -353,25 +351,6 @@ sub cancel_scheduled_proxy_install {
$pxt->redirect($url . "?sid=$sid");
}
-sub server_hardware_list_refresh_cb {
- my $pxt = shift;
-
- my $sid = $pxt->param('sid');
- die "no server id" unless $sid;
-
- my $earliest_date = RHN::Date->now->long_date;
- my $action_id = RHN::Scheduler->schedule_hardware_refresh(-org_id => $pxt->user->org_id,
- -user_id => $pxt->user->id,
- -earliest => $earliest_date,
- -server_id => $sid);
-
- my $system = RHN::Server->lookup(-id => $sid);
-
- $pxt->push_message(site_info => sprintf("You have successfully scheduled a hardware profile refresh for <strong>%s</strong>.", PXT::Utils->escapeHTML($system->name)));
-
- return;
-}
-
sub server_name {
my $pxt = shift;
commit eafd1033f26d9cfd1f39f930d5c600d0480dfc40
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Tue Nov 29 14:43:32 2011 +0100
code cleanup - tag rhn-server-network-details is not used anymore
diff --git a/web/modules/sniglets/Sniglets/Servers.pm b/web/modules/sniglets/Sniglets/Servers.pm
index add24ba..cb26efb 100644
--- a/web/modules/sniglets/Sniglets/Servers.pm
+++ b/web/modules/sniglets/Sniglets/Servers.pm
@@ -55,9 +55,6 @@ sub register_tags {
$pxt->register_tag('rhn-tri-state-system-pref-list' => \&tri_state_system_pref_list);
- # has to run after server_details
- $pxt->register_tag('rhn-server-network-details' => \&server_network_details, 2);
-
$pxt->register_tag('rhn-server-history-event-details' => \&server_history_event_details);
$pxt->register_tag('rhn-proxy-entitlement-form' => \&proxy_entitlement_form);
@@ -644,48 +641,6 @@ sub reboot_server_cb {
$pxt->redirect("/rhn/systems/details/Overview.do?sid=$sid&message=system.reboot.scheduled&messagep1=" . $server->name . "&messagep2=" . $pretty_earliest_date . "&messagep3=" . $action_id);
}
-sub server_network_details {
- my $pxt = shift;
- my %params = @_;
- my $ret = '';
- my $current;
-
- my $server = $pxt->pnotes('server');
-
- throw "No server." unless $server;
-
- my @netinfos = $server->get_net_infos;
-
- my %subst;
-
- if (not @netinfos) {
-
- %subst = (counter => '', ip => 'unknown', hostname => 'unknown');
- PXT::Debug->log(7, "subst: " . Data::Dumper->Dump([(\%subst)]));
- return PXT::Utils->perform_substitutions($params{__block__}, \%subst);
- }
-
- PXT::Debug->log(7, "got netinfos...");
-
- my $counter = 1;
-
- my $html = $params{__block__};
-
- foreach my $netinfo (@netinfos) {
- my %subst;
-
- $subst{ip} = defined $netinfo->ipaddr ? $netinfo->ipaddr : "";
- $subst{hostname} = defined $netinfo->hostname ? $netinfo->hostname : "";
- $subst{counter} = $counter > 1 ? " ".$counter : "";
-
- PXT::Utils->escapeHTML_multi(\%subst);
-
- $ret .= PXT::Utils->perform_substitutions($html, \%subst);
- }
-
- return $ret;
-}
-
my @user_server_prefs = ( { name => 'receive_notifications',
label => 'Receive Notifications of Updates/Errata' },
{ name => 'include_in_daily_summary',
commit 436d8d5b941f77f6cb85c14d4eaea96cbe684f9c
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Tue Nov 29 14:41:41 2011 +0100
code cleanup - tag rhn-server-device is not used anymore
diff --git a/web/modules/sniglets/Sniglets/Servers.pm b/web/modules/sniglets/Sniglets/Servers.pm
index 1542126..add24ba 100644
--- a/web/modules/sniglets/Sniglets/Servers.pm
+++ b/web/modules/sniglets/Sniglets/Servers.pm
@@ -55,8 +55,6 @@ sub register_tags {
$pxt->register_tag('rhn-tri-state-system-pref-list' => \&tri_state_system_pref_list);
- $pxt->register_tag('rhn-server-device' => \&server_device, 1);
-
# has to run after server_details
$pxt->register_tag('rhn-server-network-details' => \&server_network_details, 2);
@@ -688,60 +686,6 @@ sub server_network_details {
return $ret;
}
-# must happen *after* server_hardware_profile... so use tags
-# correctly!
-sub server_device {
- my $pxt = shift;
- my %params = @_;
-
- my $current;
- my $devices_html = '';
-
- my $class = $params{'class'};
-
- my $server_devices = $pxt->pnotes("server_devices");
-
- my $device_list = $server_devices->{$class};
-
- if (!$device_list) {
- return '';
- }
-
- my %valid_attribs = (HwDevice =>[qw/driver description pcitype bus vendor_id subdevice_id/,
- qw/detached subvendor_id device device_id vendorstring/],
- StorageDevice => [qw/driver physical pcitype description bus logical detached device/]);
-
- my $counter = 0;
- my $block = $params{__block__};
- $block =~ m/<rhn-device-data>(.*?)<\/rhn-device-data>/gism;
- my $device_data_block = $1;
-
- foreach my $device (@{$device_list}) {
-
- my %subst;
-
- if ($counter % 2) {
- $subst{row_class} = 'list-row-even';
- } else {
- $subst{row_class} = 'list-row-odd';
- }
-
- foreach my $attrib (@{$valid_attribs{(split /::/, ref $device)[-1]}}) {
- $subst{lc($class) . "_${attrib}"} = defined $device->$attrib() ? $device->$attrib() : "";
- }
- $counter++;
-
- PXT::Utils->escapeHTML_multi(\%subst);
-
- $devices_html .= PXT::Utils->perform_substitutions($device_data_block, \%subst);
- }
-
-
- $block =~ s/<rhn-device-data>.*?<\/rhn-device-data>/$devices_html/gism;
-
- return $block;
-}
-
my @user_server_prefs = ( { name => 'receive_notifications',
label => 'Receive Notifications of Updates/Errata' },
{ name => 'include_in_daily_summary',
commit 34021185f629eba29b914275228b40328ec3f438
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Tue Nov 29 14:37:10 2011 +0100
code cleanup - tag rhn-dmi-info is not used anymore
diff --git a/web/modules/sniglets/Sniglets/Servers.pm b/web/modules/sniglets/Sniglets/Servers.pm
index 770d565..1542126 100644
--- a/web/modules/sniglets/Sniglets/Servers.pm
+++ b/web/modules/sniglets/Sniglets/Servers.pm
@@ -55,7 +55,6 @@ sub register_tags {
$pxt->register_tag('rhn-tri-state-system-pref-list' => \&tri_state_system_pref_list);
- $pxt->register_tag('rhn-dmi-info' => \&server_dmi_info, 1);
$pxt->register_tag('rhn-server-device' => \&server_device, 1);
# has to run after server_details
@@ -743,42 +742,6 @@ sub server_device {
return $block;
}
-sub server_dmi_info {
- my $pxt = shift;
- my %params = @_;
-
- my $block = $params{__block__};
- my $server = $pxt->pnotes('server');
-
- throw "No server found." unless $server;
-
- my $subst;
-
- my @dmi_fields = qw/vendor system product bios_vendor board bios_release bios_version asset/;
-
- my $got_dmi;
-
- foreach my $field (@dmi_fields) {
-
- my $fn = 'dmi_' . $field;
- my $temp = $server->$fn();
-
- if ($temp) {
-
- $subst->{$fn} = PXT::Utils->escapeHTML($temp);
- $got_dmi = 1;
- }
- else {
- $subst->{$fn} = ' ';
- }
- }
-
- return '' if not $got_dmi;
-
- $block = PXT::Utils->perform_substitutions($block, $subst);
- return $block;
-}
-
my @user_server_prefs = ( { name => 'receive_notifications',
label => 'Receive Notifications of Updates/Errata' },
{ name => 'include_in_daily_summary',
commit 0585725d1282251b87cf88058c2016c5a7ff0747
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Tue Nov 29 14:35:18 2011 +0100
code cleanup - tag rhn-server-hardware-profile is not used anywhere
diff --git a/web/modules/sniglets/Sniglets/Servers.pm b/web/modules/sniglets/Sniglets/Servers.pm
index 155a69b..770d565 100644
--- a/web/modules/sniglets/Sniglets/Servers.pm
+++ b/web/modules/sniglets/Sniglets/Servers.pm
@@ -55,7 +55,6 @@ sub register_tags {
$pxt->register_tag('rhn-tri-state-system-pref-list' => \&tri_state_system_pref_list);
- $pxt->register_tag('rhn-server-hardware-profile' => \&server_hardware_profile);
$pxt->register_tag('rhn-dmi-info' => \&server_dmi_info, 1);
$pxt->register_tag('rhn-server-device' => \&server_device, 1);
@@ -780,81 +779,6 @@ sub server_dmi_info {
return $block;
}
-sub server_hardware_profile {
- my $pxt = shift;
- my %params = @_;
-
- my $sid = $pxt->param('sid');
- die "no server id" unless ($sid);
-
- my $server = RHN::Server->lookup(-id => $sid);
-
- $pxt->pnotes(server => $server);
-
- if (not $server->has_hardware_profile) {
- return "<div align=\"center\"><strong>Hardware not yet profiled.</strong></div>";
- }
-
-
- my $ret = $params{__block__};
-
- my @storage_devices = $server->get_storage_devices;
- my @cd_devices = $server->get_cd_devices;
-
- # Hardware devices can have the following classes (note
- # that these could have been changed in the db after I
- # write this!!):
-
- # CLASS
- # ----------------
- # AUDIO
- # MODEM
- # MOUSE
- # NETWORK
- # OTHER
- # SCSI
- # SOCKET
- # USB
- # VIDEO
-
-
- my @hardware_devices = $server->get_hw_devices;
-
- # USB fix
- foreach my $hw_device (@hardware_devices) {
- if (defined $hw_device->bus() and $hw_device->bus eq 'USB') {
-# warn "HW USB fix... class from: " . $hw_device->class;
- $hw_device->class('USB');
-# warn "to: " . $hw_device->class;
- }
- }
-
- my %hw_dev_sorted;
-
- # we're mushing these all to be handled by a subtag
- push @{ $hw_dev_sorted{$_->class} }, $_ foreach (@hardware_devices, @storage_devices, @cd_devices);
-
- my %subst;
-
- # take care of the one-off's here...
- $subst{server_name} = PXT::Utils->escapeHTML($server->name || '');
-
- foreach (qw/cpu_model cpu_mhz cpu_bogomips cpu_arch_name cpu_vendor cpu_cache cpu_stepping cpu_family memory_ram memory_swap/) {
- $subst{$_} = defined $server->$_() ? $server->$_() : '';
- $subst{cpu_arch_name} = $server->get_cpu_arch_name || '';
- }
-
- $subst{cpu_count} = defined $server->cpu_nrcpu() ? $server->cpu_nrcpu() : '';
-
- PXT::Utils->escapeHTML_multi(\%subst);
-
- $pxt->pnotes('server_devices' => \%hw_dev_sorted);
-
- return PXT::Utils->perform_substitutions($ret, \%subst);
- #return Data::Dumper->Dump([($server)]);
- #return "<pre>".Data::Dumper->Dump([(%hw_dev_sorted)])."</pre>";
-}
-
my @user_server_prefs = ( { name => 'receive_notifications',
label => 'Receive Notifications of Updates/Errata' },
{ name => 'include_in_daily_summary',
12 years, 4 months
Changes to 'refs/tags/spacewalk-java-1.6.82-1'
by Milan Zazrivec
Tag 'spacewalk-java-1.6.82-1' created by Milan Zazrivec <mzazrivec(a)redhat.com> at 2011-11-29 13:50 +0000
Tagging package [spacewalk-java] version [1.6.82-1] in directory [java/].
Changes since spacewalk-java-1.6.81-1:
Milan Zazrivec (2):
unit test fix
Automatic commit of package [spacewalk-java] release [1.6.82-1].
---
java/code/src/com/redhat/rhn/domain/server/test/ServerFactoryVirtualizationTest.java | 2 +-
java/spacewalk-java.spec | 5 ++++-
rel-eng/packages/spacewalk-java | 2 +-
3 files changed, 6 insertions(+), 3 deletions(-)
---
12 years, 4 months
2 commits - java/code java/spacewalk-java.spec rel-eng/packages
by Milan Zazrivec
java/code/src/com/redhat/rhn/domain/server/test/ServerFactoryVirtualizationTest.java | 2 +-
java/spacewalk-java.spec | 5 ++++-
rel-eng/packages/spacewalk-java | 2 +-
3 files changed, 6 insertions(+), 3 deletions(-)
New commits:
commit 610beb30f073c65d55a02dcfd8ece8ab49359190
Author: Milan Zazrivec <mzazrivec(a)redhat.com>
Date: Tue Nov 29 14:50:34 2011 +0100
Automatic commit of package [spacewalk-java] release [1.6.82-1].
diff --git a/java/spacewalk-java.spec b/java/spacewalk-java.spec
index 5076cb3..e7dd45f 100644
--- a/java/spacewalk-java.spec
+++ b/java/spacewalk-java.spec
@@ -17,7 +17,7 @@ Name: spacewalk-java
Summary: Spacewalk Java site packages
Group: Applications/Internet
License: GPLv2
-Version: 1.6.81
+Version: 1.6.82
Release: 1%{?dist}
URL: https://fedorahosted.org/spacewalk
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
@@ -557,6 +557,9 @@ fi
%{jardir}/postgresql-jdbc.jar
%changelog
+* Tue Nov 29 2011 Milan Zazrivec <mzazrivec(a)redhat.com> 1.6.82-1
+- unit test fix (mzazrivec(a)redhat.com)
+
* Tue Nov 29 2011 Miroslav Suchý 1.6.81-1
- IPv6: disabled interface - take IPv6 addresses into account
(mzazrivec(a)redhat.com)
diff --git a/rel-eng/packages/spacewalk-java b/rel-eng/packages/spacewalk-java
index 8c82c79..57d8c13 100644
--- a/rel-eng/packages/spacewalk-java
+++ b/rel-eng/packages/spacewalk-java
@@ -1 +1 @@
-1.6.81-1 java/
+1.6.82-1 java/
commit 85d5ac865217a2aee7b51066a02ac5a110b6dbf3
Author: Milan Zazrivec <mzazrivec(a)redhat.com>
Date: Tue Nov 29 14:49:41 2011 +0100
unit test fix
diff --git a/java/code/src/com/redhat/rhn/domain/server/test/ServerFactoryVirtualizationTest.java b/java/code/src/com/redhat/rhn/domain/server/test/ServerFactoryVirtualizationTest.java
index 3ed6836..40372f1 100644
--- a/java/code/src/com/redhat/rhn/domain/server/test/ServerFactoryVirtualizationTest.java
+++ b/java/code/src/com/redhat/rhn/domain/server/test/ServerFactoryVirtualizationTest.java
@@ -180,7 +180,7 @@ public class ServerFactoryVirtualizationTest extends RhnBaseTestCase {
Server retrievedGuest = ServerFactory.lookupById(guest.getId());
retrievedGuest.setName("the_guest");
- retrievedGuest.getVirtualInstance().setConfirmed(1);
+ retrievedGuest.getVirtualInstance().setConfirmed((long) 1);
ServerFactory.save(retrievedGuest);
flushAndEvict(retrievedGuest);
12 years, 4 months