spacewalk-commits October 2011

spacewalk-commits@lists.fedorahosted.org

9 participants
236 discussions

java/code
by Šimon Lukašík 24 Oct '11

24 Oct '11

java/code/src/com/redhat/rhn/common/hibernate/ConnectionManager.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 14195b6f2da8f2e1b1f3504e633dc08aca67b0aa Author: Simon Lukasik <slukasik(a)redhat.com> Date: Mon Oct 24 11:58:15 2011 +0200 Amending incorrect substitution from ee3623222bf. diff --git a/java/code/src/com/redhat/rhn/common/hibernate/ConnectionManager.java b/java/code/src/com/redhat/rhn/common/hibernate/ConnectionManager.java index 527d22d..ea0b9c9 100644 --- a/java/code/src/com/redhat/rhn/common/hibernate/ConnectionManager.java +++ b/java/code/src/com/redhat/rhn/common/hibernate/ConnectionManager.java @@ -168,7 +168,7 @@ class ConnectionManager { Config.get() .getString(ConfigDefaults.DB_PASSWORD)); String connectionUrl = - Config.get().getString(ConfigDefaults.DB_CLASS) + ":"; + Config.get().getString(ConfigDefaults.DB_PROTO) + ":"; String dbName = Config.get().getString(ConfigDefaults.DB_NAME); String dbHost = Config.get().getString(ConfigDefaults.DB_HOST); String dbPort = Config.get().getString(ConfigDefaults.DB_PORT);

1 0

Changes to 'refs/tags/rhncfg-5.10.19-1'
by Jan Pazdziora 24 Oct '11

24 Oct '11

Tag 'rhncfg-5.10.19-1' created by Jan Pazdziora <jpazdziora(a)redhat.com> at 2011-10-24 09:56 +0000 Tagging package [rhncfg] version [5.10.19-1] in directory [client/tools/rhncfg/]. Changes since spacewalk-search-1.6.5-1: Jan Pazdziora (1): Automatic commit of package [rhncfg] release [5.10.19-1]. Simon Lukasik (1): Do not hardcode config identifier, use defaults instead. Tomas Lestach (1): 682845 - fix apidoc of repository related APIs --- client/tools/rhncfg/rhncfg.spec | 6 java/code/src/com/redhat/rhn/common/hibernate/ConnectionManager.java | 2 java/code/src/com/redhat/rhn/frontend/xmlrpc/channel/software/ChannelSoftwareHandler.java | 92 +++++----- rel-eng/packages/rhncfg | 2 4 files changed, 53 insertions(+), 49 deletions(-) ---

1 0

client/tools rel-eng/packages
by Jan Pazdziora 24 Oct '11

24 Oct '11

client/tools/rhncfg/rhncfg.spec | 6 +++++- rel-eng/packages/rhncfg | 2 +- 2 files changed, 6 insertions(+), 2 deletions(-) New commits: commit 34a538ecdd4193b3bc23cc5b503ca327bad0f70a Author: Jan Pazdziora <jpazdziora(a)redhat.com> Date: Mon Oct 24 11:56:10 2011 +0200 Automatic commit of package [rhncfg] release [5.10.19-1]. diff --git a/client/tools/rhncfg/rhncfg.spec b/client/tools/rhncfg/rhncfg.spec index 9332835..9aa25cd 100644 --- a/client/tools/rhncfg/rhncfg.spec +++ b/client/tools/rhncfg/rhncfg.spec @@ -8,7 +8,7 @@ Group: Applications/System License: GPLv2 and Python URL: https://fedorahosted.org/spacewalk Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz -Version: 5.10.18 +Version: 5.10.19 Release: 1%{?dist} BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch @@ -106,6 +106,10 @@ rm -rf $RPM_BUILD_ROOT # $Id$ %changelog +* Mon Oct 24 2011 Jan Pazdziora 5.10.19-1 +- 743121 - don't report differences containing invalid UTF-8 + (mzazrivec(a)redhat.com) + * Wed Oct 19 2011 Milan Zazrivec <mzazrivec(a)redhat.com> 5.10.18-1 - 743424 - rhncfg-client diff: do not fail when not a valid symlink diff --git a/rel-eng/packages/rhncfg b/rel-eng/packages/rhncfg index 1139db9..0f6db1e 100644 --- a/rel-eng/packages/rhncfg +++ b/rel-eng/packages/rhncfg @@ -1 +1 @@ -5.10.18-1 client/tools/rhncfg/ +5.10.19-1 client/tools/rhncfg/

1 0

java/code
by Tomas Lestach 24 Oct '11

24 Oct '11

java/code/src/com/redhat/rhn/frontend/xmlrpc/channel/software/ChannelSoftwareHandler.java | 92 +++++----- 1 file changed, 46 insertions(+), 46 deletions(-) New commits: commit b439d123c4606918600bd3b46f88d7648ef3de30 Author: Tomas Lestach <tlestach(a)redhat.com> Date: Mon Oct 24 11:47:19 2011 +0200 682845 - fix apidoc of repository related APIs diff --git a/java/code/src/com/redhat/rhn/frontend/xmlrpc/channel/software/ChannelSoftwareHandler.java b/java/code/src/com/redhat/rhn/frontend/xmlrpc/channel/software/ChannelSoftwareHandler.java index b4193cb..4076167 100644 --- a/java/code/src/com/redhat/rhn/frontend/xmlrpc/channel/software/ChannelSoftwareHandler.java +++ b/java/code/src/com/redhat/rhn/frontend/xmlrpc/channel/software/ChannelSoftwareHandler.java @@ -2346,18 +2346,18 @@ public class ChannelSoftwareHandler extends BaseHandler { } /** - * Creates a ContentSource (repo) - * @param sessionKey WebSession containing User information. + * Creates a repository + * @param sessionKey Session containing user information. * @param label of the repo to be created * @param type of the repo (YUM only for now) * @param url of the repo - * @return the new ContentSource + * @return new ContentSource * - * @xmlrpc.doc Creates a ContentSource (repo) + * @xmlrpc.doc Creates a repository * @xmlrpc.param #session_key() - * @xmlrpc.param #param_desc("string", "label", "label of repo wanted") - * @xmlrpc.param #param_desc("string", "type", "type of repo wanted") - * @xmlrpc.param #param_desc("string", "url", "url of repo wanted") + * @xmlrpc.param #param_desc("string", "label", "repository label") + * @xmlrpc.param #param_desc("string", "type", "repository type (only YUM is supported)") + * @xmlrpc.param #param_desc("string", "url", "repository url") * @xmlrpc.returntype $ContentSourceSerializer **/ public ContentSource createRepo(String sessionKey, String label, String type, @@ -2377,12 +2377,12 @@ public class ChannelSoftwareHandler extends BaseHandler { } /** - * Removes a ContentSource (repo) - * @param sessionKey WebSession containing User information. + * Removes a repository + * @param sessionKey Session containing user information. * @param id of the repo to be removed * @return Integer 1 on success * - * @xmlrpc.doc Creates a ContentSource (repo) + * @xmlrpc.doc Removes a repository * @xmlrpc.param #session_key() * @xmlrpc.param #param_desc("long", "id", "ID of repo to be removed") * @xmlrpc.returntype #return_int_success() @@ -2396,12 +2396,12 @@ public class ChannelSoftwareHandler extends BaseHandler { } /** - * Removes a ContentSource (repo) - * @param sessionKey WebSession containing User information. + * Removes a repository + * @param sessionKey Session containing user information. * @param label of the repo to be removed * @return Integer 1 on success * - * @xmlrpc.doc Creates a ContentSource (repo) + * @xmlrpc.doc Removes a repository * @xmlrpc.param #session_key() * @xmlrpc.param #param_desc("string", "label", "label of repo to be removed") * @xmlrpc.returntype #return_int_success() @@ -2415,16 +2415,16 @@ public class ChannelSoftwareHandler extends BaseHandler { } /** - * Associates a ContentSource (repo) with a channel - * @param sessionKey WebSession containing User information. + * Associates a repository with a channel + * @param sessionKey Session containing user information. * @param chanLabel of the channel to use * @param repoLabel of the repo to associate * @return the channel with the newly associated repo * - * @xmlrpc.doc Associates a ContentSource (repo) with a channel + * @xmlrpc.doc Associates a repository with a channel * @xmlrpc.param #session_key() - * @xmlrpc.param #param_desc("string", "chanLabel", "of the channel to use") - * @xmlrpc.param #param_desc("string", "repoLabel", "of the repo to associate") + * @xmlrpc.param #param_desc("string", "channelLabel", "channel label") + * @xmlrpc.param #param_desc("string", "repoLabel", "repository label") * @xmlrpc.returntype $ChannelSerializer **/ public Channel associateRepo(String sessionKey, String chanLabel, String repoLabel) { @@ -2440,16 +2440,16 @@ public class ChannelSoftwareHandler extends BaseHandler { } /** - * Disassociates a ContentSource (repo) with a channel - * @param sessionKey WebSession containing User information. + * Disassociates a repository from a channel + * @param sessionKey Session containing user information. * @param chanLabel of the channel to use * @param repoLabel of the repo to disassociate * @return the channel minus the disassociated repo * - * @xmlrpc.doc Disassociates a ContentSource (repo) with a channel + * @xmlrpc.doc Disassociates a repository from a channel * @xmlrpc.param #session_key() - * @xmlrpc.param #param_desc("string", "chanLabel", "of the channel to use") - * @xmlrpc.param #param_desc("string", "repoLabel", "of the repo to disassociate") + * @xmlrpc.param #param_desc("string", "channelLabel", "channel label") + * @xmlrpc.param #param_desc("string", "repoLabel", "repository label") * @xmlrpc.returntype $ChannelSerializer **/ public Channel disassociateRepo(String sessionKey, String chanLabel, String repoLabel) { @@ -2467,16 +2467,16 @@ public class ChannelSoftwareHandler extends BaseHandler { } /** - * Updates the ContentSource (repo) source URL - * @param sessionKey WebSession containing User information. + * Updates repository source URL + * @param sessionKey Session containing user information. * @param id ID of the repo * @param url new URL to use * @return the updated repo * - * @xmlrpc.doc Updates the ContentSource (repo) source URL + * @xmlrpc.doc Updates repository source URL * @xmlrpc.param #session_key() - * @xmlrpc.param #param_desc("Long", "id", "of the repo to use") - * @xmlrpc.param #param_desc("string", "url", "new URL to use") + * @xmlrpc.param #param_desc("int", "id", "repository id") + * @xmlrpc.param #param_desc("string", "url", "repository url") * @xmlrpc.returntype $ContentSourceSerializer **/ public ContentSource updateRepoUrl(String sessionKey, Integer id, String url) { @@ -2488,16 +2488,16 @@ public class ChannelSoftwareHandler extends BaseHandler { } /** - * Updates the ContentSource (repo) source URL - * @param sessionKey WebSession containing User information. + * Updates repository source URL + * @param sessionKey Session containing user information. * @param label of the repo to use * @param url new URL to use * @return the updated repo * - * @xmlrpc.doc Updates the ContentSource (repo) source URL + * @xmlrpc.doc Updates repository source URL * @xmlrpc.param #session_key() - * @xmlrpc.param #param_desc("string", "label", "of the repo to use") - * @xmlrpc.param #param_desc("string", "url", "new URL to use") + * @xmlrpc.param #param_desc("string", "label", "repository label") + * @xmlrpc.param #param_desc("string", "url", "repository url") * @xmlrpc.returntype $ContentSourceSerializer **/ public ContentSource updateRepoUrl(String sessionKey, String label, String url) { @@ -2509,16 +2509,16 @@ public class ChannelSoftwareHandler extends BaseHandler { } /** - * Updates the ContentSource's (repo) label - * @param sessionKey WebSession containing User information. + * Updates repository label + * @param sessionKey Session containing user information. * @param id ID of the repo * @param label new label * @return the updated repo * - * @xmlrpc.doc Updates the ContentSource's (repo) label + * @xmlrpc.doc Updates repository label * @xmlrpc.param #session_key() - * @xmlrpc.param #param_desc("Long", "id", "of the repo to use") - * @xmlrpc.param #param_desc("string", "label", "new label to use") + * @xmlrpc.param #param_desc("int", "id", "repository id") + * @xmlrpc.param #param_desc("string", "label", "new repository label") * @xmlrpc.returntype $ContentSourceSerializer **/ public ContentSource updateRepoLabel(String sessionKey, Integer id, String label) { @@ -2530,8 +2530,8 @@ public class ChannelSoftwareHandler extends BaseHandler { } /** - * Updates a ContentSource (repo) - * @param sessionKey WebSession containing User information. + * Updates a repository + * @param sessionKey Session containing user information. * @param id ID of the repo * @param label new label * @param url new URL @@ -2539,9 +2539,9 @@ public class ChannelSoftwareHandler extends BaseHandler { * * @xmlrpc.doc Updates a ContentSource (repo) * @xmlrpc.param #session_key() - * @xmlrpc.param #param_desc("Long", "id", "of the repo to use") - * @xmlrpc.param #param_desc("string", "label", "new label to use") - * @xmlrpc.param #param_desc("string", "url", "new URL to use") + * @xmlrpc.param #param_desc("int", "id", "repository id") + * @xmlrpc.param #param_desc("string", "label", "new repository label") + * @xmlrpc.param #param_desc("string", "url", "new repository URL") * @xmlrpc.returntype $ContentSourceSerializer **/ public ContentSource updateRepo(String sessionKey, Integer id, String label, @@ -2556,11 +2556,11 @@ public class ChannelSoftwareHandler extends BaseHandler { /** * Returns the details of the given repo - * @param sessionKey WebSession containing User information. + * @param sessionKey Session containing user information. * @param repoLabel Label of repo whose details are sought. * @return the repo requested. * - * @xmlrpc.doc Returns details of the given repo + * @xmlrpc.doc Returns details of the given repository * @xmlrpc.param #session_key() * @xmlrpc.param #param_desc("string", "repoLabel", "repo to query") * @xmlrpc.returntype @@ -2572,7 +2572,7 @@ public class ChannelSoftwareHandler extends BaseHandler { /** * Returns the details of the given repo - * @param sessionKey WebSession containing User information. + * @param sessionKey Session containing user information. * @param id ID of repo whose details are sought. * @return the repo requested. *

1 0

java/code
by Šimon Lukašík 24 Oct '11

24 Oct '11

java/code/src/com/redhat/rhn/common/hibernate/ConnectionManager.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit ee3623222bff1b5fdccf0abad1ca3a57bb16541b Author: Simon Lukasik <slukasik(a)redhat.com> Date: Mon Oct 24 11:49:28 2011 +0200 Do not hardcode config identifier, use defaults instead. diff --git a/java/code/src/com/redhat/rhn/common/hibernate/ConnectionManager.java b/java/code/src/com/redhat/rhn/common/hibernate/ConnectionManager.java index 71690dd..527d22d 100644 --- a/java/code/src/com/redhat/rhn/common/hibernate/ConnectionManager.java +++ b/java/code/src/com/redhat/rhn/common/hibernate/ConnectionManager.java @@ -168,7 +168,7 @@ class ConnectionManager { Config.get() .getString(ConfigDefaults.DB_PASSWORD)); String connectionUrl = - Config.get().getString("hibernate.connection.driver_proto") + ":"; + Config.get().getString(ConfigDefaults.DB_CLASS) + ":"; String dbName = Config.get().getString(ConfigDefaults.DB_NAME); String dbHost = Config.get().getString(ConfigDefaults.DB_HOST); String dbPort = Config.get().getString(ConfigDefaults.DB_PORT);

1 0

Changes to 'refs/tags/spacewalk-search-1.6.5-1'
by Jan Pazdziora 24 Oct '11

24 Oct '11

Tag 'spacewalk-search-1.6.5-1' created by Jan Pazdziora <jpazdziora(a)redhat.com> at 2011-10-24 09:51 +0000 Tagging package [spacewalk-search] version [1.6.5-1] in directory [search-server/spacewalk-search/]. Changes since spacewalk-java-1.6.64-1: Jan Pazdziora (2): 745102 - fixing typo. Automatic commit of package [spacewalk-search] release [1.6.5-1]. --- rel-eng/packages/spacewalk-search | 2 +- search-server/spacewalk-search/spacewalk-search.spec | 5 ++++- search-server/spacewalk-search/src/config/com/redhat/satellite/search/db/server.xml | 2 +- 3 files changed, 6 insertions(+), 3 deletions(-) ---

1 0

rel-eng/packages search-server/spacewalk-search
by Jan Pazdziora 24 Oct '11

24 Oct '11

rel-eng/packages/spacewalk-search | 2 +- search-server/spacewalk-search/spacewalk-search.spec | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) New commits: commit 73d24bbbdbc33f5b0904a58c8e38740aa17209ce Author: Jan Pazdziora <jpazdziora(a)redhat.com> Date: Mon Oct 24 11:51:08 2011 +0200 Automatic commit of package [spacewalk-search] release [1.6.5-1]. diff --git a/rel-eng/packages/spacewalk-search b/rel-eng/packages/spacewalk-search index 3af0bfd..7158f16 100644 --- a/rel-eng/packages/spacewalk-search +++ b/rel-eng/packages/spacewalk-search @@ -1 +1 @@ -1.6.4-1 search-server/spacewalk-search/ +1.6.5-1 search-server/spacewalk-search/ diff --git a/search-server/spacewalk-search/spacewalk-search.spec b/search-server/spacewalk-search/spacewalk-search.spec index 33402e7..434281f 100644 --- a/search-server/spacewalk-search/spacewalk-search.spec +++ b/search-server/spacewalk-search/spacewalk-search.spec @@ -4,7 +4,7 @@ Name: spacewalk-search Summary: Spacewalk Full Text Search Server Group: Applications/Internet License: GPLv2 -Version: 1.6.4 +Version: 1.6.5 Release: 1%{?dist} # This src.rpm is cannonical upstream # You can obtain it using this set of commands @@ -116,6 +116,9 @@ fi %{_sysconfdir}/logrotate.d/rhn-search %changelog +* Mon Oct 24 2011 Jan Pazdziora 1.6.5-1 +- 745102 - fixing typo. + * Thu Oct 13 2011 Miroslav Suchý 1.6.4-1 - 745102 - display IPv6 from networkinfo in SDC and in system search

1 0

search-server/spacewalk-search
by Jan Pazdziora 24 Oct '11

24 Oct '11

search-server/spacewalk-search/src/config/com/redhat/satellite/search/db/server.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 836b9f2dc869ddfd0bd138fb96406125fa795c03 Author: Jan Pazdziora <jpazdziora(a)redhat.com> Date: Mon Oct 24 11:50:29 2011 +0200 745102 - fixing typo. diff --git a/search-server/spacewalk-search/src/config/com/redhat/satellite/search/db/server.xml b/search-server/spacewalk-search/src/config/com/redhat/satellite/search/db/server.xml index ad7dba1..2fd3554 100644 --- a/search-server/spacewalk-search/src/config/com/redhat/satellite/search/db/server.xml +++ b/search-server/spacewalk-search/src/config/com/redhat/satellite/search/db/server.xml @@ -23,7 +23,7 @@ sl.country as country, rsn.hostname as hostname, rsn.ipaddr as ipaddr, - rsn.ip6addr ad ip6addr, + rsn.ip6addr as ip6addr, dmi.vendor as dmiVendor, dmi.system as dmiSystem, dmi.product as dmiProduct,

1 0

Branch 'ipv6' - 4 commits - web/modules
by Miroslav Suchý 24 Oct '11

24 Oct '11

web/modules/rhn/RHN/DB/Server.pm | 9 -- web/modules/rhn/RHN/DB/Server/NetInterface.pm | 86 -------------------------- web/modules/sniglets/Sniglets/Servers.pm | 62 ------------------ 3 files changed, 157 deletions(-) New commits: commit e30b3100f597d78b622842962b179b56fbe30e90 Author: Miroslav Suchý <msuchy(a)redhat.com> Date: Mon Oct 24 11:07:54 2011 +0200 code cleanup - package RHN::DB::Server::NetInterface is not used anymore diff --git a/web/modules/rhn/RHN/DB/Server.pm b/web/modules/rhn/RHN/DB/Server.pm index 1eef958..22269cb 100644 --- a/web/modules/rhn/RHN/DB/Server.pm +++ b/web/modules/rhn/RHN/DB/Server.pm @@ -25,7 +25,6 @@ use RHN::DB::Server::CdDevice; use RHN::DB::Server::HwDevice; use RHN::DB::Server::StorageDevice; use RHN::DB::Server::NetInfo; -use RHN::DB::Server::NetInterface; use RHN::DB::TableClass; use RHN::DataSource::Errata; diff --git a/web/modules/rhn/RHN/DB/Server/NetInterface.pm b/web/modules/rhn/RHN/DB/Server/NetInterface.pm deleted file mode 100644 index 238b75c..0000000 --- a/web/modules/rhn/RHN/DB/Server/NetInterface.pm +++ /dev/null @@ -1,86 +0,0 @@ -# -# Copyright (c) 2008--2010 Red Hat, Inc. -# -# This software is licensed to you under the GNU General Public License, -# version 2 (GPLv2). There is NO WARRANTY for this software, express or -# implied, including the implied warranties of MERCHANTABILITY or FITNESS -# FOR A PARTICULAR PURPOSE. You should have received a copy of GPLv2 -# along with this software; if not, see -# http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt. -# -# Red Hat trademarks are not licensed under GPLv2. No permission is -# granted to use or replicate Red Hat trademarks that are incorporated -# in this software or its documentation. -# - -use strict; - -package RHN::DB::Server::NetInterface; - -use RHN::DB; -use Carp; -use RHN::DB::TableClass; - -# Corresponds to an entry in the rhnServerNetInterface table... - -my @net_interface_fields = qw/SERVER_ID NAME IP_ADDR NETMASK BROADCAST HW_ADDR MODULE/; - -my $n = new RHN::DB::TableClass("rhnServerNetInterface", "N", "", @net_interface_fields); - -# create a blank net info object -sub _blank_net_interface { - my $class = shift; - - my $self = bless {}, $class; - - return $self; -} - -# returns an array of net info objects given a server id -sub lookup_net_interface_by_server { - my $class = shift; - my $server_id = shift; - - my $dbh = RHN::DB->connect; - - my $query; - my $sth; - - $query = $n->select_query("N.SERVER_ID = ?"); - $sth = $dbh->prepare($query); - $sth->execute($server_id); - - my @ret; - my $count = 0; - - while (my @columns = $sth->fetchrow) { - if ($columns[0]) { - $ret[$count] = $class->_blank_net_interface; - $ret[$count]->{"__".$_."__"} = shift @columns foreach $n->method_names; - } - $count++; - } - - $sth->finish; - return @ret; -} - -# build some read-only accessors -foreach my $field ($n->method_names) { - my $sub = q { - sub RHN::DB::Server::NetInterface::[[field]] { - my $self = shift; - return $self->{__[[field]]__}; - } - }; - - $sub =~ s/\[\[field\]\]/$field/g; - eval $sub; - - if ($@) { - die $@; - } -} - - -return 1; commit 43a21e5912d3d843dcadae2dba574b07dfee9f2f Author: Miroslav Suchý <msuchy(a)redhat.com> Date: Mon Oct 24 11:06:33 2011 +0200 code cleanup - function get_net_interfaces is not used anymore diff --git a/web/modules/rhn/RHN/DB/Server.pm b/web/modules/rhn/RHN/DB/Server.pm index 36e5283..1eef958 100644 --- a/web/modules/rhn/RHN/DB/Server.pm +++ b/web/modules/rhn/RHN/DB/Server.pm @@ -1383,14 +1383,6 @@ sub get_net_infos { return @net_infos; } -# returns an array of all the net info objects related to a server -sub get_net_interfaces { - my $self = shift; - - my @net_interfaces = RHN::DB::Server::NetInterface->lookup_net_interface_by_server($self->id); - return @net_interfaces; -} - # # build some accessors commit 77ab04a1efa346456ad65bf394883c0c12f8c4de Author: Miroslav Suchý <msuchy(a)redhat.com> Date: Mon Oct 24 11:05:47 2011 +0200 code cleanup - function server_network_interfaces is not used anymore diff --git a/web/modules/sniglets/Sniglets/Servers.pm b/web/modules/sniglets/Sniglets/Servers.pm index 270b9fa..155a69b 100644 --- a/web/modules/sniglets/Sniglets/Servers.pm +++ b/web/modules/sniglets/Sniglets/Servers.pm @@ -690,64 +690,6 @@ sub server_network_details { return $ret; } - -sub server_network_interfaces { - my $pxt = shift; - my %params = @_; - my $ret = ''; - my $current; - - my $server = $pxt->pnotes('server'); - - throw "No server." unless $server; - - my @net_interfaces = $server->get_net_interfaces; - - my %subst; - - if (not @net_interfaces) { - return ''; - } - - PXT::Debug->log(7, "got net_interfaces..."); - - my $block = $params{__block__}; - $block =~ m/<rhn-interface-data>(.*?)<\/rhn-interface-data>/gism; - my $device_data_block = $1; - - - my $unknown = '<span class="no-details">(unknown)</span>'; - my $html = ''; - my $counter = 1; - foreach my $interface (@net_interfaces) { - - my %subst; - if ($counter % 2) { - $subst{row_class} = 'list-row-odd'; - } - else { - $subst{row_class} = 'list-row-even'; - } - - - $subst{interface_name} = $interface->name; # NOT NULL - $subst{interface_ip_addr} = defined $interface->ip_addr ? PXT::Utils->escapeHTML($interface->ip_addr) : $unknown; - $subst{interface_netmask} = defined $interface->netmask ? PXT::Utils->escapeHTML($interface->netmask) : $unknown; - $subst{interface_broadcast} = defined $interface->broadcast ? PXT::Utils->escapeHTML($interface->broadcast) : $unknown; - $subst{interface_hw_addr} = defined $interface->hw_addr ? PXT::Utils->escapeHTML($interface->hw_addr) : $unknown; - $subst{interface_module} = defined $interface->module ? PXT::Utils->escapeHTML($interface->module) : $unknown; - - $html .= PXT::Utils->perform_substitutions($device_data_block, \%subst); - $counter++; - } - - PXT::Debug->log(7, "html: $html"); - - $block =~ s{<rhn-interface-data>.*?<\/rhn-interface-data>}{$html}ism; - - return $block; -} - # must happen *after* server_hardware_profile... so use tags # correctly! sub server_device { commit bed645fe345850a2654968d764cb7847162371a1 Author: Miroslav Suchý <msuchy(a)redhat.com> Date: Mon Oct 24 11:04:27 2011 +0200 code cleanup - tag rhn-server-network-interfaces is not used anywhere diff --git a/web/modules/sniglets/Sniglets/Servers.pm b/web/modules/sniglets/Sniglets/Servers.pm index 1407073..270b9fa 100644 --- a/web/modules/sniglets/Sniglets/Servers.pm +++ b/web/modules/sniglets/Sniglets/Servers.pm @@ -61,10 +61,6 @@ sub register_tags { # has to run after server_details $pxt->register_tag('rhn-server-network-details' => \&server_network_details, 2); - # slightly different than the rhn-server-network-details, this gives access to - # more detailed info about the network interfaces, as opposed to just hostname/ipaddy - $pxt->register_tag('rhn-server-network-interfaces' => \&server_network_interfaces, 2); - $pxt->register_tag('rhn-server-history-event-details' => \&server_history_event_details);

1 0

Changes to 'refs/tags/spacewalk-java-1.6.64-1'
by Šimon Lukašík 24 Oct '11

24 Oct '11

Tag 'spacewalk-java-1.6.64-1' created by Simon Lukasik <slukasik(a)redhat.com> at 2011-10-24 08:32 +0000 Tagging package [spacewalk-java] version [1.6.64-1] in directory [java/]. Changes since rhnlib-2.5.46-1: Simon Lukasik (3): 748341 - No need to specify docBase, when it's the same as appBase No need to have separate configuration per Tomcat's version Automatic commit of package [spacewalk-java] release [1.6.64-1]. --- java/conf/rhn.xml | 3 +-- java/conf/rhn6.xml | 22 ---------------------- java/spacewalk-java.spec | 10 ++++++++-- rel-eng/packages/spacewalk-java | 2 +- 4 files changed, 10 insertions(+), 27 deletions(-) ---

1 0

← Newer
1
...
5
6
7
8
9
10
11
...
24
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

spacewalk-commits October 2011