client/tools
by Šimon Lukašík
client/tools/spacewalk-remote-utils/spacewalk-create-channel/spacewalk-create-channel | 2 ++
1 file changed, 2 insertions(+)
New commits:
commit a90a482e438db710334e913f49428ee24e7e87d3
Author: Simon Lukasik <slukasik(a)redhat.com>
Date: Fri Jul 8 12:07:42 2011 +0200
719555 - override channel name of ComputeNode
diff --git a/client/tools/spacewalk-remote-utils/spacewalk-create-channel/spacewalk-create-channel b/client/tools/spacewalk-remote-utils/spacewalk-create-channel/spacewalk-create-channel
index d9fe062..ed4c297 100755
--- a/client/tools/spacewalk-remote-utils/spacewalk-create-channel/spacewalk-create-channel
+++ b/client/tools/spacewalk-remote-utils/spacewalk-create-channel/spacewalk-create-channel
@@ -337,6 +337,8 @@ def findSrcChan(version, release, arch, extra = None):
return "redhat-ent-linux-i386-es-2.1"
if release == "ws":
return "redhat-ent-linux-i386-ws-2.1"
+ if low_release == "computenode":
+ low_release = "hpc-node"
#if we don't have a subrepo/extras we're done
if extra == None:
return "rhel-%s-%s-%s" % (arch, low_release, version)
12 years, 8 months
java/code
by Milan Zazrivec
java/code/webapp/WEB-INF/pages/systems/systemsearch.jsp | 1 +
1 file changed, 1 insertion(+)
New commits:
commit 416385d5d8fbda23ccf3af506e790ffae330e3e5
Author: Milan Zazrivec <mzazrivec(a)redhat.com>
Date: Thu Jul 7 16:21:19 2011 +0200
719632 - include security token in system search filter
diff --git a/java/code/webapp/WEB-INF/pages/systems/systemsearch.jsp b/java/code/webapp/WEB-INF/pages/systems/systemsearch.jsp
index 60fe473..23fb046 100644
--- a/java/code/webapp/WEB-INF/pages/systems/systemsearch.jsp
+++ b/java/code/webapp/WEB-INF/pages/systems/systemsearch.jsp
@@ -92,6 +92,7 @@
<c:if test="${search_string != null && search_string != ''}">
<hr/>
<rl:listset name="searchSet">
+ <rhn:csrf />
<input type="hidden" name="submitted" value="true"/>
<input type="hidden" name="search_string" value="${search_string}" />
<input type="hidden" name="view_mode" value="${view_mode}" />
12 years, 8 months
2 commits - java/code web/html
by Tomas Lestach
java/code/src/com/redhat/rhn/common/db/datasource/xml/Channel_queries.xml | 2
java/code/src/com/redhat/rhn/frontend/action/channel/RedHatChannelTreeAction.java | 35 ---------
java/code/src/com/redhat/rhn/frontend/action/channel/VendorChannelTreeAction.java | 35 +++++++++
java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_bn_IN.xml | 2
java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_de.xml | 2
java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_en_US.xml | 2
java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_es.xml | 2
java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_fr.xml | 2
java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_gu.xml | 2
java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_hi.xml | 2
java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_it.xml | 2
java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ja.xml | 2
java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ko.xml | 2
java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_pa.xml | 2
java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_pt_BR.xml | 2
java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ru.xml | 2
java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ta.xml | 2
java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_zh_CN.xml | 2
java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_zh_TW.xml | 2
java/code/src/com/redhat/rhn/frontend/strings/nav/StringResource_en_US.xml | 2
java/code/src/com/redhat/rhn/frontend/xmlrpc/channel/ChannelHandler.java | 29 ++++++-
java/code/src/com/redhat/rhn/manager/channel/ChannelManager.java | 8 +-
java/code/src/com/redhat/rhn/manager/channel/test/ChannelManagerTest.java | 4 -
java/code/webapp/WEB-INF/nav/channel_tabs.xml | 4 -
java/code/webapp/WEB-INF/nav/sitenav-authenticated.xml | 2
java/code/webapp/WEB-INF/pages/channel/redhat.jsp | 38 ----------
java/code/webapp/WEB-INF/pages/channel/vendor.jsp | 38 ++++++++++
java/code/webapp/WEB-INF/struts-config.xml | 8 +-
web/html/nav/sitenav-authenticated.xml | 2
29 files changed, 130 insertions(+), 109 deletions(-)
New commits:
commit 68c528b417445d59ec9e153cdda0d902a82f63d9
Author: Johannes Renner <jrenner(a)suse.de>
Date: Tue Jul 5 12:48:33 2011 +0200
Refactor and deprecate API method to listVendorChannels
diff --git a/java/code/src/com/redhat/rhn/frontend/xmlrpc/channel/ChannelHandler.java b/java/code/src/com/redhat/rhn/frontend/xmlrpc/channel/ChannelHandler.java
index a1135b0..2ccc127 100644
--- a/java/code/src/com/redhat/rhn/frontend/xmlrpc/channel/ChannelHandler.java
+++ b/java/code/src/com/redhat/rhn/frontend/xmlrpc/channel/ChannelHandler.java
@@ -121,20 +121,21 @@ public class ChannelHandler extends BaseHandler {
}
/**
- * Lists all Red Hat software channels that the user's organization is entitled to.
+ * Lists all the vendor software channels that the user's organization is
+ * entitled to.
* @param sessionKey session containing User information.
* @return Returns array of channels with info such as channel_label, channel_name,
* channel_parent_label, packages and systems.
*
- * @xmlrpc.doc List all Red Hat software channels that the user's organization is
- * entitled to.
+ * @xmlrpc.doc Lists all the vendor software channels that the user's organization
+ * is entitled to.
* @xmlrpc.param #session_key()
* @xmlrpc.returntype
* #array()
* $ChannelTreeNodeSerializer
* #array_end()
*/
- public Object[] listRedHatChannels(String sessionKey) {
+ public Object[] listVendorChannels(String sessionKey) {
User user = ChannelHandler.getLoggedInUser(sessionKey);
DataResult<ChannelTreeNode> dr = ChannelManager.vendorChannelTree(user, null);
dr.elaborate();
@@ -142,6 +143,26 @@ public class ChannelHandler extends BaseHandler {
}
/**
+ * Lists all Red Hat software channels that the user's organization is entitled to.
+ * @param sessionKey session containing User information.
+ * @return Returns array of channels with info such as channel_label, channel_name,
+ * channel_parent_label, packages and systems.
+ * @deprecated being replaced by listVendorChannels(String sessionKey)
+ *
+ * @xmlrpc.doc List all Red Hat software channels that the user's organization is
+ * entitled to.
+ * @xmlrpc.param #session_key()
+ * @xmlrpc.returntype
+ * #array()
+ * $ChannelTreeNodeSerializer
+ * #array_end()
+ */
+ @Deprecated
+ public Object[] listRedHatChannels(String sessionKey) {
+ return listVendorChannels(sessionKey);
+ }
+
+ /**
* Lists the most popular software channels based on the popularity
* count given.
* @param sessionKey session containing User information.
commit c2571159ebb53f5dc01da501ca946e764d66c9a0
Author: Johannes Renner <jrenner(a)suse.de>
Date: Tue Jul 5 11:47:55 2011 +0200
Refactor RedHat.do to Vendor.do
diff --git a/java/code/src/com/redhat/rhn/common/db/datasource/xml/Channel_queries.xml b/java/code/src/com/redhat/rhn/common/db/datasource/xml/Channel_queries.xml
index b76ed06..28c0613 100644
--- a/java/code/src/com/redhat/rhn/common/db/datasource/xml/Channel_queries.xml
+++ b/java/code/src/com/redhat/rhn/common/db/datasource/xml/Channel_queries.xml
@@ -438,7 +438,7 @@ SELECT CFO.id, CFO.org_id, CFO.name, CFO.label, CFO.current_members, CFO.max_mem
-<mode name="redhat_channel_tree" class="com.redhat.rhn.frontend.dto.ChannelTreeNode">
+<mode name="vendor_channel_tree" class="com.redhat.rhn.frontend.dto.ChannelTreeNode">
<query params="user_id">
select Distinct C.id,
C.name,
diff --git a/java/code/src/com/redhat/rhn/frontend/action/channel/RedHatChannelTreeAction.java b/java/code/src/com/redhat/rhn/frontend/action/channel/RedHatChannelTreeAction.java
deleted file mode 100644
index f5b61d9..0000000
--- a/java/code/src/com/redhat/rhn/frontend/action/channel/RedHatChannelTreeAction.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/**
- * Copyright (c) 2009--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.
- */
-package com.redhat.rhn.frontend.action.channel;
-
-import com.redhat.rhn.common.db.datasource.DataResult;
-import com.redhat.rhn.domain.user.User;
-import com.redhat.rhn.frontend.listview.ListControl;
-import com.redhat.rhn.frontend.struts.RequestContext;
-import com.redhat.rhn.manager.channel.ChannelManager;
-
-/**
- * ChannelTreeRelevantSetupAction
- * @version $Rev$
- */
-public class RedHatChannelTreeAction extends BaseChannelTreeAction {
-
- /** {@inheritDoc} */
- protected DataResult getDataResult(RequestContext requestContext, ListControl lc) {
- User user = requestContext.getCurrentUser();
- DataResult dr = ChannelManager.redHatChannelTree(user, lc);
- return dr;
- }
-}
diff --git a/java/code/src/com/redhat/rhn/frontend/action/channel/VendorChannelTreeAction.java b/java/code/src/com/redhat/rhn/frontend/action/channel/VendorChannelTreeAction.java
new file mode 100644
index 0000000..58de235
--- /dev/null
+++ b/java/code/src/com/redhat/rhn/frontend/action/channel/VendorChannelTreeAction.java
@@ -0,0 +1,35 @@
+/**
+ * Copyright (c) 2009--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.
+ */
+package com.redhat.rhn.frontend.action.channel;
+
+import com.redhat.rhn.common.db.datasource.DataResult;
+import com.redhat.rhn.domain.user.User;
+import com.redhat.rhn.frontend.listview.ListControl;
+import com.redhat.rhn.frontend.struts.RequestContext;
+import com.redhat.rhn.manager.channel.ChannelManager;
+
+/**
+ * ChannelTreeRelevantSetupAction
+ * @version $Rev$
+ */
+public class VendorChannelTreeAction extends BaseChannelTreeAction {
+
+ /** {@inheritDoc} */
+ protected DataResult getDataResult(RequestContext requestContext, ListControl lc) {
+ User user = requestContext.getCurrentUser();
+ DataResult dr = ChannelManager.vendorChannelTree(user, lc);
+ return dr;
+ }
+}
diff --git a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_bn_IN.xml b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_bn_IN.xml
index c4f06eb..feba4f1 100644
--- a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_bn_IN.xml
+++ b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_bn_IN.xml
@@ -12217,7 +12217,7 @@ the <strong>Red Hat Enterprise Linux System Administration Guide.</stro
<source>The software channels listed below are <strong>all of the channels</strong> that your organization has access to.</source>
<target></target></trans-unit>
- <trans-unit id="channels.redhat.jsp.header1">
+ <trans-unit id="channels.vendor.jsp.header1">
<source>The software channels listed below are Red Hat channels or child channels of Red Hat Channels.</source>
<target>নিম্নলিখিত সফ্টওয়্যার চ্যানেলগুলি Red Hat চ্যানেল অথবা Red Hat চ্যানেলের চাইল্ড চ্যানেল।</target></trans-unit>
diff --git a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_de.xml b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_de.xml
index d6a5209..448095f 100644
--- a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_de.xml
+++ b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_de.xml
@@ -12235,7 +12235,7 @@ Anschlie&szlig;end wird das nicht-chroot Post-Skript ausgef&uuml;hrt, un
<source>The software channels listed below are <strong>all of the channels</strong> that your organization has access to.</source>
<target>Die unten aufgeführten Software-Channels sind <strong>alle Channels</strong>, auf die Ihre Organisation Zugriff hat.</target></trans-unit>
- <trans-unit id="channels.redhat.jsp.header1">
+ <trans-unit id="channels.vendor.jsp.header1">
<source>The software channels listed below are Red Hat channels or child channels of Red Hat Channels.</source>
<target>Die unten aufgelisteten Software-Channels sind Red Hat Channels oder Sub-Channels von Red Hat Channels.</target></trans-unit>
diff --git a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_en_US.xml b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_en_US.xml
index 1cf501e..cce43fd 100644
--- a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_en_US.xml
+++ b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_en_US.xml
@@ -12561,7 +12561,7 @@ the <strong>Red Hat Enterprise Linux System Administration Guide.</stro
<source>The software channels listed below are <strong>all of the channels</strong> that your organization has access to.</source>
</trans-unit>
- <trans-unit id="channels.redhat.jsp.header1">
+ <trans-unit id="channels.vendor.jsp.header1">
<source>The software channels listed below are Red Hat channels or child channels of Red Hat Channels.</source>
</trans-unit>
diff --git a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_es.xml b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_es.xml
index 820b33c..8d014f0 100644
--- a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_es.xml
+++ b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_es.xml
@@ -12230,7 +12230,7 @@ el <strong>Manual de administración del sistema Red Hat Enterprise Linux.
<source>The software channels listed below are <strong>all of the channels</strong> that your organization has access to.</source>
<target>Los canales software listados a continuación son <strong>todos los canales</strong> a los que su organización tiene acceso. </target></trans-unit>
- <trans-unit id="channels.redhat.jsp.header1">
+ <trans-unit id="channels.vendor.jsp.header1">
<source>The software channels listed below are Red Hat channels or child channels of Red Hat Channels.</source>
<target>Los canales de software listados a continuación son canales de Red Hat o canales hijos de canales de Red Hat.</target></trans-unit>
diff --git a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_fr.xml b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_fr.xml
index 7519b88..e3c74fa 100644
--- a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_fr.xml
+++ b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_fr.xml
@@ -12233,7 +12233,7 @@ Le script post non-chroot sera ensuite exécuté et le script post sera enfin ex
<source>The software channels listed below are <strong>all of the channels</strong> that your organization has access to.</source>
<target>Les canaux de logiciels ci-dessous sont <strong>tous les canaux</strong> auxquels votre entreprise a accès.</target></trans-unit>
- <trans-unit id="channels.redhat.jsp.header1">
+ <trans-unit id="channels.vendor.jsp.header1">
<source>The software channels listed below are Red Hat channels or child channels of Red Hat Channels.</source>
<target>Les canaux logiciels listés ci-dessous sont des canaux Red Hat ou des canaux enfants de canaux Red Hat.</target></trans-unit>
diff --git a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_gu.xml b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_gu.xml
index 59c83f9..b5b19fc 100644
--- a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_gu.xml
+++ b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_gu.xml
@@ -12218,7 +12218,7 @@ the <strong>Red Hat Enterprise Linux System Administration Guide.</stro
<source>The software channels listed below are <strong>all of the channels</strong> that your organization has access to.</source>
<target></target></trans-unit>
- <trans-unit id="channels.redhat.jsp.header1">
+ <trans-unit id="channels.vendor.jsp.header1">
<source>The software channels listed below are Red Hat channels or child channels of Red Hat Channels.</source>
<target>નીચે યાદી થયેલ સોફ્ટવેર ચેનલો એ Red Hat ચેનલોની Red Hat ચેનલો અથવા બાળ ચેનલો છે.</target></trans-unit>
diff --git a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_hi.xml b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_hi.xml
index dc70ab7..1d4b619 100644
--- a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_hi.xml
+++ b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_hi.xml
@@ -12218,7 +12218,7 @@ the <strong>Red Hat Enterprise Linux System Administration Guide.</stro
<source>The software channels listed below are <strong>all of the channels</strong> that your organization has access to.</source>
<target></target></trans-unit>
- <trans-unit id="channels.redhat.jsp.header1">
+ <trans-unit id="channels.vendor.jsp.header1">
<source>The software channels listed below are Red Hat channels or child channels of Red Hat Channels.</source>
<target>नीचे सूचीबद्ध सॉफ्टवेयर चैनल Red Hat चैनल या Red Hat का संतति चैनल है.</target></trans-unit>
diff --git a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_it.xml b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_it.xml
index 8880b27..79cbcad 100644
--- a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_it.xml
+++ b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_it.xml
@@ -12215,7 +12215,7 @@ la <strong>Red Hat Enterprise Linux System Administration Guide.</stron
<source>The software channels listed below are <strong>all of the channels</strong> that your organization has access to.</source>
<target></target></trans-unit>
- <trans-unit id="channels.redhat.jsp.header1">
+ <trans-unit id="channels.vendor.jsp.header1">
<source>The software channels listed below are Red Hat channels or child channels of Red Hat Channels.</source>
<target>I canali software di seguito elencati sono i canali di Red Hat o canali figlio di Red Hat Channels.</target></trans-unit>
diff --git a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ja.xml b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ja.xml
index f16315f..b29282d 100644
--- a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ja.xml
+++ b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ja.xml
@@ -12217,7 +12217,7 @@ the <strong>Red Hat Enterprise Linux System Administration Guide.</stro
<source>The software channels listed below are <strong>all of the channels</strong> that your organization has access to.</source>
<target>以下にリストされたソフトウェアチャンネルは、組織がアクセスできる<strong>すべてのチャンネル</strong>です。</target></trans-unit>
- <trans-unit id="channels.redhat.jsp.header1">
+ <trans-unit id="channels.vendor.jsp.header1">
<source>The software channels listed below are Red Hat channels or child channels of Red Hat Channels.</source>
<target>以下に表示されているソフトウェアチャンネルは、Red Hat チャンネルまたは Red Hat チャンネルの子チャンネルです。</target></trans-unit>
diff --git a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ko.xml b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ko.xml
index c15ca8b..fbfe908 100644
--- a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ko.xml
+++ b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ko.xml
@@ -12213,7 +12213,7 @@ the <strong>Red Hat Enterprise Linux System Administration Guide.</stro
<source>The software channels listed below are <strong>all of the channels</strong> that your organization has access to.</source>
<target></target></trans-unit>
- <trans-unit id="channels.redhat.jsp.header1">
+ <trans-unit id="channels.vendor.jsp.header1">
<source>The software channels listed below are Red Hat channels or child channels of Red Hat Channels.</source>
<target>다음의 소프트웨어 채널 목록은 Red Hat 채널이거나 Red Hat 채널의 자식 채널입니다. </target></trans-unit>
diff --git a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_pa.xml b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_pa.xml
index 9890b30..b284f5e 100644
--- a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_pa.xml
+++ b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_pa.xml
@@ -12217,7 +12217,7 @@ the <strong>Red Hat Enterprise Linux System Administration Guide.</stro
<source>The software channels listed below are <strong>all of the channels</strong> that your organization has access to.</source>
<target></target></trans-unit>
- <trans-unit id="channels.redhat.jsp.header1">
+ <trans-unit id="channels.vendor.jsp.header1">
<source>The software channels listed below are Red Hat channels or child channels of Red Hat Channels.</source>
<target>ਹੇਠਾਂ ਦਿੱਤੇ ਸਾਟਫਵੇਅਰ ਚੈਨਲ Red Hat ਚੈਨਲ ਜਾਂ Red Hat ਚੈਨਲਾਂ ਦੇ ਅਧੀਨ ਚੈਨਲ ਹਨ।</target></trans-unit>
diff --git a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_pt_BR.xml b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_pt_BR.xml
index d778b56..015f1f7 100644
--- a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_pt_BR.xml
+++ b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_pt_BR.xml
@@ -12224,7 +12224,7 @@ o <strong>Guia de Administração de Sistemas Red Hat Enterprise Li
<source>The software channels listed below are <strong>all of the channels</strong> that your organization has access to.</source>
<target>Os canais de software listados abaixo são <strong>todos os canais</strong> que sua organização tem acesso.</target></trans-unit>
- <trans-unit id="channels.redhat.jsp.header1">
+ <trans-unit id="channels.vendor.jsp.header1">
<source>The software channels listed below are Red Hat channels or child channels of Red Hat Channels.</source>
<target>Os canais de software listados abaixo são canais da Red Hat ou canais filho do Red Hat Channels.</target></trans-unit>
diff --git a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ru.xml b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ru.xml
index 8833af1..6ad4d82 100644
--- a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ru.xml
+++ b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ru.xml
@@ -12212,7 +12212,7 @@ the <strong>Red Hat Enterprise Linux System Administration Guide.</stro
<source>The software channels listed below are <strong>all of the channels</strong> that your organization has access to.</source>
<target></target></trans-unit>
- <trans-unit id="channels.redhat.jsp.header1">
+ <trans-unit id="channels.vendor.jsp.header1">
<source>The software channels listed below are Red Hat channels or child channels of Red Hat Channels.</source>
<target>Перечисленные ниже программные каналы являются каналами Red Hat или их дочерними каналами.</target></trans-unit>
diff --git a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ta.xml b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ta.xml
index 7e1b3d4..3d15197 100644
--- a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ta.xml
+++ b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ta.xml
@@ -12218,7 +12218,7 @@ the <strong>Red Hat Enterprise Linux System Administration Guide.</stro
<source>The software channels listed below are <strong>all of the channels</strong> that your organization has access to.</source>
<target></target></trans-unit>
- <trans-unit id="channels.redhat.jsp.header1">
+ <trans-unit id="channels.vendor.jsp.header1">
<source>The software channels listed below are Red Hat channels or child channels of Red Hat Channels.</source>
<target>கீழே பட்டியலிடப்பட்ட மென்பொருள் தடங்கள் Red Hat தடங்கள் அல்லது Red Hat தடங்களின் சேய் தடங்களாக இருக்கலாம்.கள் ஆகும்.</target></trans-unit>
diff --git a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_zh_CN.xml b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_zh_CN.xml
index 058b71c..08f6be2 100644
--- a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_zh_CN.xml
+++ b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_zh_CN.xml
@@ -12228,7 +12228,7 @@ kickstart 前脚本的内容可以在 <strong>《红帽企业版 Linux 系
<source>The software channels listed below are <strong>all of the channels</strong> that your organization has access to.</source>
<target>下面列出的软件频道是您的组织可以访问的<strong>所有频道</strong>。</target></trans-unit>
- <trans-unit id="channels.redhat.jsp.header1">
+ <trans-unit id="channels.vendor.jsp.header1">
<source>The software channels listed below are Red Hat channels or child channels of Red Hat Channels.</source>
<target>以下列出的软件包频道是红帽频道或者红帽频道的子频道。</target></trans-unit>
diff --git a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_zh_TW.xml b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_zh_TW.xml
index 967a5e0..e44db2f 100644
--- a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_zh_TW.xml
+++ b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_zh_TW.xml
@@ -12214,7 +12214,7 @@ the <strong>Red Hat Enterprise Linux System Administration Guide.</stro
<source>The software channels listed below are <strong>all of the channels</strong> that your organization has access to.</source>
<target></target></trans-unit>
- <trans-unit id="channels.redhat.jsp.header1">
+ <trans-unit id="channels.vendor.jsp.header1">
<source>The software channels listed below are Red Hat channels or child channels of Red Hat Channels.</source>
<target>以下列出的軟體頻道為 Red Hat Channels 的 Red Hat 頻道或子頻道。</target></trans-unit>
diff --git a/java/code/src/com/redhat/rhn/frontend/strings/nav/StringResource_en_US.xml b/java/code/src/com/redhat/rhn/frontend/strings/nav/StringResource_en_US.xml
index 29afad1..22dcd87 100644
--- a/java/code/src/com/redhat/rhn/frontend/strings/nav/StringResource_en_US.xml
+++ b/java/code/src/com/redhat/rhn/frontend/strings/nav/StringResource_en_US.xml
@@ -273,7 +273,7 @@ http://www.oasis-open.org/committees/xliff/documents/xliff-core-1.1.xsd"
</context-group>
</trans-unit>
- <trans-unit id="channel.nav.redhat">
+ <trans-unit id="channel.nav.vendor">
<source>Red Hat Channels</source>
<context-group name="ctx">
<context context-type="sourcefile">Channel Navigation Menu</context>
diff --git a/java/code/src/com/redhat/rhn/frontend/xmlrpc/channel/ChannelHandler.java b/java/code/src/com/redhat/rhn/frontend/xmlrpc/channel/ChannelHandler.java
index 0b952fd..a1135b0 100644
--- a/java/code/src/com/redhat/rhn/frontend/xmlrpc/channel/ChannelHandler.java
+++ b/java/code/src/com/redhat/rhn/frontend/xmlrpc/channel/ChannelHandler.java
@@ -136,7 +136,7 @@ public class ChannelHandler extends BaseHandler {
*/
public Object[] listRedHatChannels(String sessionKey) {
User user = ChannelHandler.getLoggedInUser(sessionKey);
- DataResult<ChannelTreeNode> dr = ChannelManager.redHatChannelTree(user, null);
+ DataResult<ChannelTreeNode> dr = ChannelManager.vendorChannelTree(user, null);
dr.elaborate();
return dr.toArray();
}
diff --git a/java/code/src/com/redhat/rhn/manager/channel/ChannelManager.java b/java/code/src/com/redhat/rhn/manager/channel/ChannelManager.java
index 9e045b9..a4996e7 100644
--- a/java/code/src/com/redhat/rhn/manager/channel/ChannelManager.java
+++ b/java/code/src/com/redhat/rhn/manager/channel/ChannelManager.java
@@ -449,14 +449,14 @@ public class ChannelManager extends BaseManager {
/**
* Returns a list of ChannelTreeNodes that have orgId null
- * or has a prarent with org_id null
- * @param user who we are requesting Red Hat channels for
+ * or has a parent with org_id null
+ * @param user who we are requesting channels for
* @param lc ListControl to use
* @return list of ChannelTreeNode's
*/
- public static DataResult redHatChannelTree(User user,
+ public static DataResult vendorChannelTree(User user,
ListControl lc) {
- SelectMode m = ModeFactory.getMode("Channel_queries", "redhat_channel_tree");
+ SelectMode m = ModeFactory.getMode("Channel_queries", "vendor_channel_tree");
Map params = new HashMap();
diff --git a/java/code/src/com/redhat/rhn/manager/channel/test/ChannelManagerTest.java b/java/code/src/com/redhat/rhn/manager/channel/test/ChannelManagerTest.java
index cc24f64..f2b7ba0 100644
--- a/java/code/src/com/redhat/rhn/manager/channel/test/ChannelManagerTest.java
+++ b/java/code/src/com/redhat/rhn/manager/channel/test/ChannelManagerTest.java
@@ -157,14 +157,14 @@ public class ChannelManagerTest extends BaseTestCaseWithUser {
}
- public void testRedHatChannelTree() throws Exception {
+ public void testVendorChannelTree() throws Exception {
Channel channel = ChannelFactoryTest.createTestChannel(user);
channel.setOrg(null);
OrgFactory.save(user.getOrg());
ChannelFactory.save(channel);
- DataResult dr = ChannelManager.redHatChannelTree(user, null);
+ DataResult dr = ChannelManager.vendorChannelTree(user, null);
assertNotEmpty(dr);
}
diff --git a/java/code/webapp/WEB-INF/nav/channel_tabs.xml b/java/code/webapp/WEB-INF/nav/channel_tabs.xml
index 924800f..5471bc5 100644
--- a/java/code/webapp/WEB-INF/nav/channel_tabs.xml
+++ b/java/code/webapp/WEB-INF/nav/channel_tabs.xml
@@ -4,8 +4,8 @@
<rhn-tab name="channel.nav.all">
<rhn-tab-url>/rhn/software/channels/All.do</rhn-tab-url>
</rhn-tab>
- <rhn-tab name="channel.nav.redhat" acl="is_satellite()">
- <rhn-tab-url>/rhn/software/channels/RedHat.do</rhn-tab-url>
+ <rhn-tab name="channel.nav.vendor" acl="is_satellite()">
+ <rhn-tab-url>/rhn/software/channels/Vendor.do</rhn-tab-url>
</rhn-tab>
<rhn-tab name="channel.nav.popular">
<rhn-tab-url>/rhn/software/channels/Popular.do</rhn-tab-url>
diff --git a/java/code/webapp/WEB-INF/nav/sitenav-authenticated.xml b/java/code/webapp/WEB-INF/nav/sitenav-authenticated.xml
index 805b7a7..e232b9c 100644
--- a/java/code/webapp/WEB-INF/nav/sitenav-authenticated.xml
+++ b/java/code/webapp/WEB-INF/nav/sitenav-authenticated.xml
@@ -139,7 +139,7 @@
<rhn-tab name="Software Channels" url="/rhn/software/channels/All.do">
<rhn-tab-directory>/rhn/channels</rhn-tab-directory>
<rhn-tab name="channel.nav.all" url="/rhn/software/channels/All.do"/>
- <rhn-tab name="channel.nav.redhat" url="/rhn/software/channels/RedHat.do" acl="is_satellite()"/>
+ <rhn-tab name="channel.nav.vendor" url="/rhn/software/channels/Vendor.do" acl="is_satellite()"/>
<rhn-tab name="channel.nav.popular" url="/rhn/software/channels/Popular.do"/>
<rhn-tab name="channel.nav.custom" url="/rhn/software/channels/Custom.do"/>
<rhn-tab name="channel.nav.shared" url="/rhn/software/channels/Shared.do"/>
diff --git a/java/code/webapp/WEB-INF/pages/channel/redhat.jsp b/java/code/webapp/WEB-INF/pages/channel/redhat.jsp
deleted file mode 100644
index 30c0387..0000000
--- a/java/code/webapp/WEB-INF/pages/channel/redhat.jsp
+++ /dev/null
@@ -1,38 +0,0 @@
-<%@ taglib uri="http://struts.apache.org/tags-html" prefix="html" %>
-<%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean" %>
-<%@ taglib uri="http://rhn.redhat.com/rhn" prefix="rhn" %>
-<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
-<html:xhtml/>
-<html>
-
-<head>
-<script src="/javascript/channel_tree.js" type="text/javascript"></script>
-<script type="text/javascript">
-var filtered = ${requestScope.isFiltered};
-function showFiltered() {
- if (filtered)
- ShowAll();
-}
-</script>
-</head>
-
-<body onLoad="onLoadStuff(3); showFiltered();">
-<rhn:toolbar base="h1" img="/img/rhn-icon-software.gif" imgAlt="channels.overview.toolbar.imgAlt">
- <bean:message key="channel.nav.redhat"/>
-</rhn:toolbar>
-
-<%@ include file="/WEB-INF/pages/common/fragments/channel/channel_tabs.jspf" %>
-
-<p>
-<bean:message key="channels.redhat.jsp.header1" />
-</p>
-
-
-<form method="post" name="rhn_list" action="/rhn/software/channels/RedHat.do">
- <rhn:csrf />
- <rhn:submitted />
- <%@ include file="/WEB-INF/pages/common/fragments/channel/channel_tree.jspf" %>
-</form>
-
-</body>
-</html>
diff --git a/java/code/webapp/WEB-INF/pages/channel/vendor.jsp b/java/code/webapp/WEB-INF/pages/channel/vendor.jsp
new file mode 100644
index 0000000..525e39d
--- /dev/null
+++ b/java/code/webapp/WEB-INF/pages/channel/vendor.jsp
@@ -0,0 +1,38 @@
+<%@ taglib uri="http://jakarta.apache.org/struts/tags-html" prefix="html" %>
+<%@ taglib uri="http://jakarta.apache.org/struts/tags-bean" prefix="bean" %>
+<%@ taglib uri="http://rhn.redhat.com/rhn" prefix="rhn" %>
+<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
+<html:xhtml/>
+<html>
+
+<head>
+<script src="/javascript/channel_tree.js" type="text/javascript"></script>
+<script type="text/javascript">
+var filtered = ${requestScope.isFiltered};
+function showFiltered() {
+ if (filtered)
+ ShowAll();
+}
+</script>
+</head>
+
+<body onLoad="onLoadStuff(3); showFiltered();">
+<rhn:toolbar base="h1" img="/img/rhn-icon-software.gif" imgAlt="channels.overview.toolbar.imgAlt">
+ <bean:message key="channel.nav.vendor"/>
+</rhn:toolbar>
+
+<%@ include file="/WEB-INF/pages/common/fragments/channel/channel_tabs.jspf" %>
+
+<p>
+<bean:message key="channels.vendor.jsp.header1" />
+</p>
+
+
+<form method="post" name="rhn_list" action="/rhn/software/channels/Vendor.do">
+ <rhn:csrf />
+ <rhn:submitted />
+ <%@ include file="/WEB-INF/pages/common/fragments/channel/channel_tree.jspf" %>
+</form>
+
+</body>
+</html>
diff --git a/java/code/webapp/WEB-INF/struts-config.xml b/java/code/webapp/WEB-INF/struts-config.xml
index ee6f3ac..ed0de71 100644
--- a/java/code/webapp/WEB-INF/struts-config.xml
+++ b/java/code/webapp/WEB-INF/struts-config.xml
@@ -2468,12 +2468,12 @@
<!-- ===== CHANNELS ===== -->
- <action path="/software/channels/RedHat"
+ <action path="/software/channels/Vendor"
scope="request"
- input="/WEB-INF/pages/channel/redhat.jsp"
- type="com.redhat.rhn.frontend.action.channel.RedHatChannelTreeAction">
+ input="/WEB-INF/pages/channel/vendor.jsp"
+ type="com.redhat.rhn.frontend.action.channel.VendorChannelTreeAction">
<forward name="default"
- path="/WEB-INF/pages/channel/redhat.jsp" />
+ path="/WEB-INF/pages/channel/vendor.jsp" />
</action>
<action path="/software/channels/Popular"
diff --git a/web/html/nav/sitenav-authenticated.xml b/web/html/nav/sitenav-authenticated.xml
index 2ef404b..ea6eff6 100644
--- a/web/html/nav/sitenav-authenticated.xml
+++ b/web/html/nav/sitenav-authenticated.xml
@@ -101,7 +101,7 @@
<rhn-tab-directory>/network/channels</rhn-tab-directory>
<rhn-tab-directory>/network/software/channels</rhn-tab-directory>
<rhn-tab name="All Channels" url="/rhn/software/channels/All.do"/>
- <rhn-tab name="Red Hat Channels" url="/rhn/software/channels/RedHat.do"/>
+ <rhn-tab name="Red Hat Channels" url="/rhn/software/channels/Vendor.do"/>
<rhn-tab name="Popular Channels" url="/rhn/software/channels/Popular.do"/>
<rhn-tab name="My Channels" url="/rhn/software/channels/Custom.do"/>
<rhn-tab name="Shared Channels" url="/rhn/software/channels/Shared.do"/>
12 years, 8 months
client/tools
by Tomas Lestach
client/tools/spacewalk-koan/spacewalkkoan/spacewalkkoan.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 510a30175ec99a524e63d625c7e356c761d75eeb
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Thu Jul 7 11:53:10 2011 +0200
691417 - allow extra whitespace behing nameserver IP in resolv.conf
diff --git a/client/tools/spacewalk-koan/spacewalkkoan/spacewalkkoan.py b/client/tools/spacewalk-koan/spacewalkkoan/spacewalkkoan.py
index 0b25e53..d3c9706 100644
--- a/client/tools/spacewalk-koan/spacewalkkoan/spacewalkkoan.py
+++ b/client/tools/spacewalk-koan/spacewalkkoan/spacewalkkoan.py
@@ -52,7 +52,7 @@ def find_ip(device):
return execute("ifconfig %s | perl -lne '/inet addr:([\d.]+)/ and print $1'" % device)[0]
def find_name_servers():
- servers = execute("cat /etc/resolv.conf | perl -lne '/^nameserver\s+(\S+)$/ and print $1'")
+ 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":
12 years, 8 months