Branch 'yum-repo-sync' - java/code
by Shannon Hughes
java/code/webapp/WEB-INF/pages/kickstart/cobbler/snippets.jsp | 40 ++++++----
1 file changed, 25 insertions(+), 15 deletions(-)
New commits:
commit 5fe07f4162a7dbad2559220bd72e8047c5ad8620
Author: Shannon Hughes <shughes(a)redhat.com>
Date: Wed May 12 10:24:01 2010 -0400
Revert "fixing accidental branch creation, removing cobbler stubs"
This reverts commit ba2c85ace5e35e7388e59673e0bb7f899a1fc8bb.
diff --git a/java/code/webapp/WEB-INF/pages/kickstart/cobbler/snippets.jsp b/java/code/webapp/WEB-INF/pages/kickstart/cobbler/snippets.jsp
index 09ef2a6..1a73888 100644
--- a/java/code/webapp/WEB-INF/pages/kickstart/cobbler/snippets.jsp
+++ b/java/code/webapp/WEB-INF/pages/kickstart/cobbler/snippets.jsp
@@ -7,15 +7,17 @@
<html>
<body>
<rhn:toolbar base="h1" img="/img/rhn-icon-info.gif"
- creationUrl="RepoCreate.do"
- creationType="repos"
+ creationUrl="CobblerSnippetCreate.do"
+ creationType="snippets"
imgAlt="info.alt.img">
- <bean:message key="repos.jsp.toolbar"/>
+ <bean:message key="snippets.jsp.toolbar"/>
</rhn:toolbar>
+<rhn:dialogmenu mindepth="0" maxdepth="1" definition="/WEB-INF/nav/snippet_tabs.xml"
+ renderer="com.redhat.rhn.frontend.nav.DialognavRenderer" />
<div class="page-summary">
-<p><bean:message key="repos.jsp.summary"/></p>
+<p><bean:message key="snippets.jsp.summary"/></p>
<c:if test="${not empty requestScope.default}">
- <rhn:note key = "repos.jsp.note.default"/>
+ <rhn:note key = "snippets.jsp.note.default"/>
</c:if>
</div>
@@ -25,7 +27,7 @@
width="100%"
name="keysList"
styleclass="list"
- emptykey="cobbler.repo.jsp.norepos"
+ emptykey="cobbler.snippet.jsp.nosnippets"
alphabarcolumn="name">
<rl:decorator name="PageSizeDecorator"/>
@@ -33,19 +35,27 @@
<!-- Description name column -->
<rl:column bound="false"
sortable="true"
- headerkey="channel.repo.label"
+ headerkey="cobbler.snippet.name"
styleclass="first-column"
- sortattr= "label"
- filterattr="label">
- <c:choose>
- <c:out value="<a href=\"/rhn/channels/manage/repos/RepoEdit.do?id=${current.id}\">${current.label}</a>" escapeXml="false" />
+ sortattr= "name"
+ filterattr="name">
+ <c:choose>
+ <c:when test = "${current.editable}">
+ <c:out value="<a href=\"/rhn/kickstart/cobbler/CobblerSnippetEdit.do?name=${current.name}\">${current.name}</a>" escapeXml="false" />
+ </c:when>
+ <c:otherwise>
+ <c:out value="<a href=\"/rhn/kickstart/cobbler/CobblerSnippetView.do?path=${current.displayPath}\">${current.name}</a>" escapeXml="false" />
+ </c:otherwise>
+
</c:choose>
</rl:column>
- <rl:column headerkey="channel.repo.lastsync" styleclass="last-column">
- <c:out value="${current.sync}"/>
- </rl:column>
+ <rl:column headerkey="cobbler.snippet.macro" styleclass="last-column">
+ <c:out value="${current.fragment}"/>
+ </rl:column>
</rl:list>
- </rl:listset>
+ </rl:listset>
+
+ <rhn:tooltip key="cobbler.snippet.copy-paste-snippet-tip"/>
</body>
</html>
13 years, 12 months
client/rhel
by Transifex System User
client/rhel/rhnsd/po/cs.po | 26 +++++++++++++-------------
1 file changed, 13 insertions(+), 13 deletions(-)
New commits:
commit 4195e1267a303e48fc6c0060ca2e6bac591aa31b
Author: msuchy <msuchy(a)fedoraproject.org>
Date: Wed May 12 13:49:57 2010 +0000
l10n: Updates to Czech (cs) translation
Transmitted-via: Transifex (translate.fedoraproject.org)
diff --git a/client/rhel/rhnsd/po/cs.po b/client/rhel/rhnsd/po/cs.po
index 3b40994..965f4c8 100644
--- a/client/rhel/rhnsd/po/cs.po
+++ b/client/rhel/rhnsd/po/cs.po
@@ -15,19 +15,6 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#: rhnsd.c:116
-#, c-format
-msgid "Only root can run this program\n"
-msgstr ""
-
-#: rhnsd.c:136
-msgid "wrong number of arguments"
-msgstr ""
-
-#: rhnsd.c:143
-msgid "already running"
-msgstr ""
-
#: rhnsd.c:246
#, c-format
msgid "Written by %s.\n"
@@ -37,3 +24,16 @@ msgstr "Napsal %s.\n"
#, c-format
msgid "Copyright (C) %s Red Hat, Inc.\n"
msgstr "Copyright (C) %s Red Hat, Inc.\n"
+
+#: rhnsd.c:116
+#, c-format
+msgid "Only root can run this program\n"
+msgstr "Pouze root může spustit tento program\n"
+
+#: rhnsd.c:143
+msgid "already running"
+msgstr "již běží"
+
+#: rhnsd.c:136
+msgid "wrong number of arguments"
+msgstr "špatný počet argumentů"
13 years, 12 months
client/rhel
by Transifex System User
client/rhel/rhnsd/po/cs.po | 15 +++++++--------
1 file changed, 7 insertions(+), 8 deletions(-)
New commits:
commit 78af5bd6d42846c99f59d1199abf6ccb6caa083b
Author: msuchy <msuchy(a)fedoraproject.org>
Date: Wed May 12 13:44:48 2010 +0000
l10n: Updates to Czech (cs) translation
Transmitted-via: Transifex (translate.fedoraproject.org)
diff --git a/client/rhel/rhnsd/po/cs.po b/client/rhel/rhnsd/po/cs.po
index 95d6e40..3b40994 100644
--- a/client/rhel/rhnsd/po/cs.po
+++ b/client/rhel/rhnsd/po/cs.po
@@ -2,8 +2,7 @@
# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
# This file is distributed under the same license as the PACKAGE package.
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-#, fuzzy
+#
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
@@ -29,12 +28,12 @@ msgstr ""
msgid "already running"
msgstr ""
-#: rhnsd.c:243
-#, c-format
-msgid "Copyright (C) %s Red Hat, Inc.\n"
-msgstr ""
-
#: rhnsd.c:246
#, c-format
msgid "Written by %s.\n"
-msgstr ""
+msgstr "Napsal %s.\n"
+
+#: rhnsd.c:243
+#, c-format
+msgid "Copyright (C) %s Red Hat, Inc.\n"
+msgstr "Copyright (C) %s Red Hat, Inc.\n"
13 years, 12 months
client/rhel
by Jan Pazdziora
client/rhel/rhnlib/rhn/nonblocking.py | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
New commits:
commit 871bf2990ab0f3faf5d651782c82f92fcb463c0b
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Wed May 12 14:38:24 2010 +0200
583980 - replace fcntl.O_NDELAY with os.O_NDELAY, for newer Pythons.
diff --git a/client/rhel/rhnlib/rhn/nonblocking.py b/client/rhel/rhnlib/rhn/nonblocking.py
index dd4af4f..0d84cce 100644
--- a/client/rhel/rhnlib/rhn/nonblocking.py
+++ b/client/rhel/rhnlib/rhn/nonblocking.py
@@ -5,13 +5,13 @@
import select
import fcntl
-
+import os
class NonBlockingFile:
def __init__(self, fd):
# Keep a copy of the file descriptor
self.fd = fd
- fcntl.fcntl(self.fd.fileno(), fcntl.F_SETFL, fcntl.O_NDELAY | fcntl.FNDELAY)
+ fcntl.fcntl(self.fd.fileno(), fcntl.F_SETFL, os.O_NDELAY)
# Set the callback-related stuff
self.read_fd_set = []
self.write_fd_set = []
@@ -24,7 +24,7 @@ class NonBlockingFile:
self.read_fd_set = read_fd_set
# Make the objects non-blocking
for f in self.read_fd_set:
- fcntl.fcntl(f.fileno(), fcntl.F_SETFL, fcntl.O_NDELAY | fcntl.FNDELAY)
+ fcntl.fcntl(f.fileno(), fcntl.F_SETFL, os.O_NDELAY)
self.write_fd_set = write_fd_set
self.exc_fd_set = exc_fd_set
13 years, 12 months
client/rhel
by Jan Pazdziora
client/rhel/rhnlib/rhn/rpclib.py | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
New commits:
commit ed4e6a8ae0c01d0df815bdeb10e580ec51310eb1
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Wed May 12 14:09:18 2010 +0200
583020 - need to initialize self.send_handler for the class Server as well.
Otherwise the attribute is not defined for Server (unlike GETServer)
and __getattr__ spoils our day by invoking the XMLRPC again.
diff --git a/client/rhel/rhnlib/rhn/rpclib.py b/client/rhel/rhnlib/rhn/rpclib.py
index 3379552..6c0bd28 100644
--- a/client/rhel/rhnlib/rhn/rpclib.py
+++ b/client/rhel/rhnlib/rhn/rpclib.py
@@ -190,6 +190,9 @@ class Server:
self.set_refresh_callback(refreshCallback)
self.set_progress_callback(progressCallback)
+ # referer, which redirect us to new handler
+ self.send_handler=None
+
self._headers = UserDictCase()
def default_transport(self, type, proxy=None, username=None, password=None):
@@ -516,8 +519,6 @@ class GETServer(Server):
self._orig_handler = self._handler
# Download resumption
self.set_range(offset=None, amount=None)
- # referer, which redirect us to new handler
- self.send_handler=None
def _req_body(self, params, methodname):
if not params or len(params) < 1:
13 years, 12 months
backend/satellite_tools
by Michael Mraka
backend/satellite_tools/exporter/exportLib.py | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
New commits:
commit 76dbf2f3fe5579959738ead972fd644e20a56011
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Wed May 12 14:04:33 2010 +0200
fixed global name 'exportLib' is not defined
introduced in 93362832d55ae958f54fbd4048e297c7295618ae
[Wed May 12 13:53:15 2010] [error] File "/usr/share/rhn/satellite_tools/exporter/expor
tLib.py", line 236, in set_iterator
[Wed May 12 13:53:15 2010] [error] arr.append(exportLib.SimpleDumper(self._writer, '
rhn-channel-comps-last-modified',
[Wed May 12 13:53:15 2010] [error] NameError: global name 'exportLib' is not defined
diff --git a/backend/satellite_tools/exporter/exportLib.py b/backend/satellite_tools/exporter/exportLib.py
index 4b290c6..6b69a3a 100644
--- a/backend/satellite_tools/exporter/exportLib.py
+++ b/backend/satellite_tools/exporter/exportLib.py
@@ -233,8 +233,8 @@ class _ChannelDumper(BaseRowDumper):
comp_last_modified = self._channel_comps_last_modified()
if comp_last_modified != None:
- arr.append(exportLib.SimpleDumper(self._writer, 'rhn-channel-comps-last-modified',
- exportLib._dbtime2timestamp(comp_last_modified[0]))
+ arr.append(SimpleDumper(self._writer, 'rhn-channel-comps-last-modified',
+ _dbtime2timestamp(comp_last_modified[0]))
)
h = rhnSQL.prepare(self._query_channel_families)
13 years, 12 months
client/rhel
by Jan Pazdziora
client/rhel/rhn-client-tools/rhn-client-tools.spec | 1 +
client/rhel/rhn-client-tools/src/up2date_client/Makefile | 2 +-
2 files changed, 2 insertions(+), 1 deletion(-)
New commits:
commit 311ba296b37c98f354232a9841ad9fc688fcbddf
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Wed May 12 10:40:01 2010 +0200
591422 - add hwdata.py to rhn-client-tools.
diff --git a/client/rhel/rhn-client-tools/rhn-client-tools.spec b/client/rhel/rhn-client-tools/rhn-client-tools.spec
index 2337490..274bbef 100644
--- a/client/rhel/rhn-client-tools/rhn-client-tools.spec
+++ b/client/rhel/rhn-client-tools/rhn-client-tools.spec
@@ -160,6 +160,7 @@ make -f Makefile.rhn-client-tools test
%{_datadir}/rhn/up2date_client/config.*
%{_datadir}/rhn/up2date_client/haltree.*
%{_datadir}/rhn/up2date_client/hardware*
+%{_datadir}/rhn/up2date_client/hwdata.*
%{_datadir}/rhn/up2date_client/up2dateUtils.*
%{_datadir}/rhn/up2date_client/up2dateLog.*
%{_datadir}/rhn/up2date_client/up2dateErrors.*
diff --git a/client/rhel/rhn-client-tools/src/up2date_client/Makefile b/client/rhel/rhn-client-tools/src/up2date_client/Makefile
index a2e54cd..876ba03 100644
--- a/client/rhel/rhn-client-tools/src/up2date_client/Makefile
+++ b/client/rhel/rhn-client-tools/src/up2date_client/Makefile
@@ -4,7 +4,7 @@
# rhn-client-tools and not here.
FILES := config gui hardware progress \
- haltree hardware_hal hardware_gudev\
+ haltree hardware_hal hardware_gudev hwdata \
up2dateUtils getMethod tui \
up2dateLog rpmUtils rhnreg transaction \
up2dateErrors rpcServer up2dateAuth \
13 years, 12 months
java/code
by Partha Aji
java/code/src/com/redhat/rhn/frontend/action/kickstart/test/KickstartSystemDetailsTest.java | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
New commits:
commit 47611ee25261d69f93e5a9ad7a89e7b6a8865933
Author: Partha Aji <paji(a)redhat.com>
Date: Tue May 11 17:13:49 2010 -0400
Fixed broken unit tests
diff --git a/java/code/src/com/redhat/rhn/frontend/action/kickstart/test/KickstartSystemDetailsTest.java b/java/code/src/com/redhat/rhn/frontend/action/kickstart/test/KickstartSystemDetailsTest.java
index 29b4233..94e61f7 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/kickstart/test/KickstartSystemDetailsTest.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/kickstart/test/KickstartSystemDetailsTest.java
@@ -93,6 +93,7 @@ public class KickstartSystemDetailsTest extends BaseKickstartEditTestCase {
ksdata = (KickstartData) TestUtils.reload(ksdata);
setRequestPathInfo("/kickstart/SystemDetailsEdit");
+ addRequestParameter("registrationType", "reactivation");
addRequestParameter(RhnAction.SUBMITTED, Boolean.TRUE.toString());
addRequestParameter(SystemDetailsEditAction.SE_LINUX_PARAM,
SELinuxMode.ENFORCING.getValue());
@@ -111,6 +112,7 @@ public class KickstartSystemDetailsTest extends BaseKickstartEditTestCase {
assertNotNull(ksdata.getCommand("selinux"));
setRequestPathInfo("/kickstart/SystemDetailsEdit");
+ addRequestParameter("registrationType", "reactivation");
addRequestParameter(RhnAction.SUBMITTED, Boolean.TRUE.toString());
addRequestParameter(SystemDetailsEditAction.SE_LINUX_PARAM,
SELinuxMode.ENFORCING.getValue());
@@ -129,6 +131,7 @@ public class KickstartSystemDetailsTest extends BaseKickstartEditTestCase {
private void setupForEdit(KickstartData k) throws Exception {
setupForDisplay(k);
- addRequestParameter("submitted", "true");
+ addRequestParameter("submitted", "true");
+ addRequestParameter("registrationType", "reactivation");
}
}
13 years, 12 months
java/code
by Joshua Roys
java/code/src/com/redhat/rhn/taskomatic/task/CompareConfigFilesTask.java | 1 -
1 file changed, 1 deletion(-)
New commits:
commit 85a41f88c29f6ec56b945129480f47e1af222ef5
Author: Joshua Roys <joshua.roys(a)gtri.gatech.edu>
Date: Tue May 11 17:01:55 2010 -0400
checkstyle fix
diff --git a/java/code/src/com/redhat/rhn/taskomatic/task/CompareConfigFilesTask.java b/java/code/src/com/redhat/rhn/taskomatic/task/CompareConfigFilesTask.java
index b978f3c..faa3e61 100644
--- a/java/code/src/com/redhat/rhn/taskomatic/task/CompareConfigFilesTask.java
+++ b/java/code/src/com/redhat/rhn/taskomatic/task/CompareConfigFilesTask.java
@@ -27,7 +27,6 @@ import com.redhat.rhn.frontend.dto.ConfigFileNameDto;
import com.redhat.rhn.manager.configuration.ConfigurationManager;
import org.apache.log4j.Logger;
-import org.quartz.Job;
import org.quartz.JobExecutionContext;
import org.quartz.JobExecutionException;
13 years, 12 months
Branch 'yum-repo-sync' - java/code
by Shannon Hughes
java/code/webapp/WEB-INF/pages/kickstart/cobbler/snippets.jsp | 40 +++-------
1 file changed, 15 insertions(+), 25 deletions(-)
New commits:
commit ba2c85ace5e35e7388e59673e0bb7f899a1fc8bb
Author: Shannon Hughes <shughes(a)redhat.com>
Date: Tue May 11 17:06:38 2010 -0400
fixing accidental branch creation, removing cobbler stubs
diff --git a/java/code/webapp/WEB-INF/pages/kickstart/cobbler/snippets.jsp b/java/code/webapp/WEB-INF/pages/kickstart/cobbler/snippets.jsp
index 1a73888..09ef2a6 100644
--- a/java/code/webapp/WEB-INF/pages/kickstart/cobbler/snippets.jsp
+++ b/java/code/webapp/WEB-INF/pages/kickstart/cobbler/snippets.jsp
@@ -7,17 +7,15 @@
<html>
<body>
<rhn:toolbar base="h1" img="/img/rhn-icon-info.gif"
- creationUrl="CobblerSnippetCreate.do"
- creationType="snippets"
+ creationUrl="RepoCreate.do"
+ creationType="repos"
imgAlt="info.alt.img">
- <bean:message key="snippets.jsp.toolbar"/>
+ <bean:message key="repos.jsp.toolbar"/>
</rhn:toolbar>
-<rhn:dialogmenu mindepth="0" maxdepth="1" definition="/WEB-INF/nav/snippet_tabs.xml"
- renderer="com.redhat.rhn.frontend.nav.DialognavRenderer" />
<div class="page-summary">
-<p><bean:message key="snippets.jsp.summary"/></p>
+<p><bean:message key="repos.jsp.summary"/></p>
<c:if test="${not empty requestScope.default}">
- <rhn:note key = "snippets.jsp.note.default"/>
+ <rhn:note key = "repos.jsp.note.default"/>
</c:if>
</div>
@@ -27,7 +25,7 @@
width="100%"
name="keysList"
styleclass="list"
- emptykey="cobbler.snippet.jsp.nosnippets"
+ emptykey="cobbler.repo.jsp.norepos"
alphabarcolumn="name">
<rl:decorator name="PageSizeDecorator"/>
@@ -35,27 +33,19 @@
<!-- Description name column -->
<rl:column bound="false"
sortable="true"
- headerkey="cobbler.snippet.name"
+ headerkey="channel.repo.label"
styleclass="first-column"
- sortattr= "name"
- filterattr="name">
- <c:choose>
- <c:when test = "${current.editable}">
- <c:out value="<a href=\"/rhn/kickstart/cobbler/CobblerSnippetEdit.do?name=${current.name}\">${current.name}</a>" escapeXml="false" />
- </c:when>
- <c:otherwise>
- <c:out value="<a href=\"/rhn/kickstart/cobbler/CobblerSnippetView.do?path=${current.displayPath}\">${current.name}</a>" escapeXml="false" />
- </c:otherwise>
-
+ sortattr= "label"
+ filterattr="label">
+ <c:choose>
+ <c:out value="<a href=\"/rhn/channels/manage/repos/RepoEdit.do?id=${current.id}\">${current.label}</a>" escapeXml="false" />
</c:choose>
</rl:column>
- <rl:column headerkey="cobbler.snippet.macro" styleclass="last-column">
- <c:out value="${current.fragment}"/>
- </rl:column>
+ <rl:column headerkey="channel.repo.lastsync" styleclass="last-column">
+ <c:out value="${current.sync}"/>
+ </rl:column>
</rl:list>
- </rl:listset>
-
- <rhn:tooltip key="cobbler.snippet.copy-paste-snippet-tip"/>
+ </rl:listset>
</body>
</html>
13 years, 12 months