Changes to 'refs/tags/rhnlib-2.5.27-1'
by Miroslav Suchý
Tag 'rhnlib-2.5.27-1' created by Miroslav Suchý <msuchy(a)redhat.com> at 2010-09-20 10:42 +0000
Tagging package [rhnlib] version [2.5.27-1] in directory [client/rhel/rhnlib/].
Changes since spacewalk-reports-1.2.3-1:
Lukas Zapletal (1):
634884 - managing repositories within channels through XMLRPC API disabled
Miroslav Suchý (3):
update GPLv2 license file
add copyright file - this is required by Debian policy
Automatic commit of package [rhnlib] release [2.5.27-1].
---
client/rhel/rhnlib/COPYING | 41 ++++------
client/rhel/rhnlib/copyright | 21 +++++
client/rhel/rhnlib/rhnlib.spec | 7 +
java/code/src/com/redhat/rhn/frontend/action/channel/manage/EditChannelAction.java | 7 -
java/code/src/com/redhat/rhn/frontend/xmlrpc/channel/software/ChannelSoftwareHandler.java | 17 ----
java/code/src/com/redhat/rhn/manager/channel/CreateChannelCommand.java | 39 ---------
java/code/webapp/WEB-INF/pages/channel/manage/edit.jsp | 2
rel-eng/packages/rhnlib | 2
8 files changed, 51 insertions(+), 85 deletions(-)
---
13 years, 7 months
client/rhel rel-eng/packages
by Miroslav Suchý
client/rhel/rhnlib/rhnlib.spec | 7 ++++++-
rel-eng/packages/rhnlib | 2 +-
2 files changed, 7 insertions(+), 2 deletions(-)
New commits:
commit b4a87c0403da443406cc4a1099401b651603b010
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Mon Sep 20 12:42:45 2010 +0200
Automatic commit of package [rhnlib] release [2.5.27-1].
diff --git a/client/rhel/rhnlib/rhnlib.spec b/client/rhel/rhnlib/rhnlib.spec
index 0730953..fd86938 100644
--- a/client/rhel/rhnlib/rhnlib.spec
+++ b/client/rhel/rhnlib/rhnlib.spec
@@ -4,7 +4,7 @@ Summary: Python libraries for the RHN project
Name: rhnlib
URL: https://fedorahosted.org/spacewalk
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
-Version: 2.5.26
+Version: 2.5.27
Release: 1%{?dist}
Group: Development/Libraries
@@ -54,6 +54,11 @@ rm -rf $RPM_BUILD_ROOT
%{python_sitelib}/*
%changelog
+* Mon Sep 20 2010 Miroslav Suchý <msuchy(a)redhat.com> 2.5.27-1
+- add copyright file - this is required by Debian policy
+- update GPLv2 license file
+- 618267 - simplify regexp
+
* Thu Aug 05 2010 Milan Zazrivec <mzazrivec(a)redhat.com> 2.5.26-1
- 618267 - do not allow control characters in xmlrpc communication
diff --git a/rel-eng/packages/rhnlib b/rel-eng/packages/rhnlib
index 1d839d6..6162071 100644
--- a/rel-eng/packages/rhnlib
+++ b/rel-eng/packages/rhnlib
@@ -1 +1 @@
-2.5.26-1 client/rhel/rhnlib/
+2.5.27-1 client/rhel/rhnlib/
13 years, 7 months
java/code
by Lukas Zapletal
java/code/src/com/redhat/rhn/frontend/action/channel/manage/EditChannelAction.java | 7 -
java/code/src/com/redhat/rhn/frontend/xmlrpc/channel/software/ChannelSoftwareHandler.java | 17 ----
java/code/src/com/redhat/rhn/manager/channel/CreateChannelCommand.java | 39 ----------
java/code/webapp/WEB-INF/pages/channel/manage/edit.jsp | 2
4 files changed, 3 insertions(+), 62 deletions(-)
New commits:
commit 3d3626e2bb9073f53b3fabc15fbc52d8bdf2aac5
Author: Lukas Zapletal <lzap+git(a)redhat.com>
Date: Mon Sep 20 10:44:29 2010 +0200
634884 - managing repositories within channels through XMLRPC API disabled
diff --git a/java/code/src/com/redhat/rhn/frontend/action/channel/manage/EditChannelAction.java b/java/code/src/com/redhat/rhn/frontend/action/channel/manage/EditChannelAction.java
index 294b41e..0c93062 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/channel/manage/EditChannelAction.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/channel/manage/EditChannelAction.java
@@ -338,10 +338,6 @@ public class EditChannelAction extends RhnAction implements Listable {
ucc.setMaintainerPhone((String)form.get("maintainer_phone"));
ucc.setSupportPolicy((String)form.get("support_policy"));
ucc.setAccess((String)form.get("org_sharing"));
- ucc.setRepoLabel((String) form.getString("repo_label"));
- if (form.get("sync_repo") != null) {
- ucc.setSyncRepo((Boolean)form.get("sync_repo"));
- }
String parent = (String)form.get("parent");
if (parent == null || parent.equals("")) {
@@ -413,9 +409,6 @@ public class EditChannelAction extends RhnAction implements Listable {
ccc.setMaintainerPhone((String)form.get("maintainer_phone"));
ccc.setSupportPolicy((String)form.get("support_policy"));
ccc.setAccess((String)form.get("org_sharing"));
- if (form.get("sync_repo") != null) {
- ccc.setSyncRepo((Boolean)form.get("sync_repo"));
- }
String parent = (String)form.get("parent");
if (parent == null || parent.equals("")) {
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 030ec78..11e2b77 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
@@ -529,10 +529,6 @@ public class ChannelSoftwareHandler extends BaseHandler {
* <li>string url</li>
* <li>string id</li>
* <li>string fingerprint</li>
- * @param yumRepo a map consisting of
- * <li>string url</li>
- * <li>string label</li>
- * <li>boolean sync</li>
* @return 1 if creation of channel succeeds.
* @since 10.9
* @throws PermissionCheckFailureException thrown if user does not have
@@ -583,17 +579,11 @@ public class ChannelSoftwareHandler extends BaseHandler {
* #prop_desc("string", "id", "GPG key ID")
* #prop_desc("string", "fingerprint", "GPG key Fingerprint")
* #struct_end()
- * @xmlrpc.param
- * #struct("yumRepo")
- * #prop_desc("string", "url", "Associated Yum Repository URL")
- * #prop_desc("string", "label", "Associated Yum Repository Label")
- * #prop_desc("boolean", "sync", "Sync Yum Repository")
- * #struct_end()
* @xmlrpc.returntype int - 1 if the creation operation succeeded, 0 otherwise
*/
public int create(String sessionKey, String label, String name,
String summary, String archLabel, String parentLabel, String checksumType,
- Map gpgKey, Map yumRepo)
+ Map gpgKey)
throws PermissionCheckFailureException, InvalidChannelLabelException,
InvalidChannelNameException, InvalidParentChannelException {
@@ -612,9 +602,6 @@ public class ChannelSoftwareHandler extends BaseHandler {
ccc.setGpgKeyUrl((String)gpgKey.get("url"));
ccc.setGpgKeyId((String)gpgKey.get("id"));
ccc.setGpgKeyFp((String)gpgKey.get("fingerprint"));
- ccc.setYumUrl((String)yumRepo.get("url"));
- ccc.setRepoLabel((String)yumRepo.get("label"));
- ccc.setSyncRepo(BooleanUtils.toBoolean((Boolean) yumRepo.get("sync")));
return (ccc.create() != null) ? 1 : 0;
}
@@ -682,7 +669,7 @@ public class ChannelSoftwareHandler extends BaseHandler {
return create(sessionKey, label, name,
summary, archLabel, parentLabel, checksumType,
- new HashMap(), new HashMap());
+ new HashMap());
}
/**
diff --git a/java/code/src/com/redhat/rhn/manager/channel/CreateChannelCommand.java b/java/code/src/com/redhat/rhn/manager/channel/CreateChannelCommand.java
index b8146a9..a6607e0 100644
--- a/java/code/src/com/redhat/rhn/manager/channel/CreateChannelCommand.java
+++ b/java/code/src/com/redhat/rhn/manager/channel/CreateChannelCommand.java
@@ -73,12 +73,6 @@ public class CreateChannelCommand {
protected String maintainerPhone;
protected String supportPolicy;
protected String access = Channel.PRIVATE;
- protected String yumUrl;
- protected String repoLabel;
- protected boolean syncRepo = false;
-
-
-
/**
@@ -292,11 +286,6 @@ public class CreateChannelCommand {
ChannelManager.queueChannelChange(c.getLabel(), "createchannel", "createchannel");
ChannelFactory.refreshNewestPackageCache(c, WEB_CHANNEL_CREATED);
- if (syncRepo && !c.getSources().isEmpty()) {
- TaskFactory.createTask(user.getOrg(), RepoSyncTask.DISPLAY_NAME,
- c.getSources().iterator().next().getId());
- }
-
return c;
}
@@ -350,12 +339,6 @@ public class CreateChannelCommand {
throw new IllegalArgumentException(
"edit.channel.invalidchannelsummary");
}
-
- if (!StringUtils.isEmpty(yumUrl) && StringUtils.isEmpty(repoLabel)) {
- throw new IllegalArgumentException(
- "edit.channel.invalidrepolabel.missing");
- }
-
}
protected void verifyChannelName(String cname) throws InvalidChannelNameException {
@@ -458,26 +441,4 @@ public class CreateChannelCommand {
}
}
- /**
- * @param yumUrlIn The yumUrl to set.
- */
- public void setYumUrl(String yumUrlIn) {
- this.yumUrl = yumUrlIn;
- }
-
- /**
- * @param repoLabelIn The repoLabel to set.
- */
- public void setRepoLabel(String repoLabelIn) {
- this.repoLabel = repoLabelIn;
- }
-
-
- /**
- * @param syncRepoIn The syncRepo to set.
- */
- public void setSyncRepo(boolean syncRepoIn) {
- this.syncRepo = syncRepoIn;
- }
-
}
diff --git a/java/code/webapp/WEB-INF/pages/channel/manage/edit.jsp b/java/code/webapp/WEB-INF/pages/channel/manage/edit.jsp
index 70d3a20..bb1874b 100644
--- a/java/code/webapp/WEB-INF/pages/channel/manage/edit.jsp
+++ b/java/code/webapp/WEB-INF/pages/channel/manage/edit.jsp
@@ -96,7 +96,7 @@
<label for="checksum"><bean:message key="channel.edit.jsp.checksum"/>:</label>
</th>
<td class="small-form">
- <html:select property="checksum">
+ <html:select property="checksum" styleId="checksum">
<html:options collection="checksums"
property="value"
labelProperty="label" />
13 years, 7 months
2 commits - client/rhel
by Miroslav Suchý
client/rhel/rhnlib/COPYING | 41 ++++++++++++++++++++---------------------
client/rhel/rhnlib/copyright | 21 +++++++++++++++++++++
2 files changed, 41 insertions(+), 21 deletions(-)
New commits:
commit c5f28f7f031ebc686b572c0e4339a27a4c60d315
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Mon Sep 20 10:04:31 2010 +0200
add copyright file - this is required by Debian policy
diff --git a/client/rhel/rhnlib/copyright b/client/rhel/rhnlib/copyright
new file mode 100644
index 0000000..52c8c06
--- /dev/null
+++ b/client/rhel/rhnlib/copyright
@@ -0,0 +1,21 @@
+Rhnlib is copyright 2010 by Red Hat Inc.
+Rhnlib is currently developed by Spacewalk Development Team <spacewalk-devel(a)redhat.com>.
+
+License: GPLv2
+
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2 of the License.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program; if not, write to the Free Software
+ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
+
+See /usr/share/common-licenses/GPL-2, or
+<http://www.gnu.org/copyleft/gpl.txt> for the terms of the latest version
+of the GNU General Public License.
commit 5b3736cb86ddc475810eb914707d26e42dbef710
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Mon Sep 20 09:58:11 2010 +0200
update GPLv2 license file
FSF changed address, old one is no longer valid
I downloaded fresh new license from:
http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt
so some formating may change, but only real change is FSF address.
diff --git a/client/rhel/rhnlib/COPYING b/client/rhel/rhnlib/COPYING
index d60c31a..d159169 100644
--- a/client/rhel/rhnlib/COPYING
+++ b/client/rhel/rhnlib/COPYING
@@ -1,12 +1,12 @@
- GNU GENERAL PUBLIC LICENSE
- Version 2, June 1991
+ GNU GENERAL PUBLIC LICENSE
+ Version 2, June 1991
- Copyright (C) 1989, 1991 Free Software Foundation, Inc.
- 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ Copyright (C) 1989, 1991 Free Software Foundation, Inc.,
+ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
Everyone is permitted to copy and distribute verbatim copies
of this license document, but changing it is not allowed.
- Preamble
+ Preamble
The licenses for most software are designed to take away your
freedom to share and change it. By contrast, the GNU General Public
@@ -15,7 +15,7 @@ software--to make sure the software is free for all its users. This
General Public License applies to most of the Free Software
Foundation's software and to any other program whose authors commit to
using it. (Some other Free Software Foundation software is covered by
-the GNU Library General Public License instead.) You can apply it to
+the GNU Lesser General Public License instead.) You can apply it to
your programs, too.
When we speak of free software, we are referring to freedom, not
@@ -55,8 +55,8 @@ patent must be licensed for everyone's free use or not licensed at all.
The precise terms and conditions for copying, distribution and
modification follow.
-
- GNU GENERAL PUBLIC LICENSE
+
+ GNU GENERAL PUBLIC LICENSE
TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
0. This License applies to any program or other work which contains
@@ -110,7 +110,7 @@ above, provided that you also meet all of these conditions:
License. (Exception: if the Program itself is interactive but
does not normally print such an announcement, your work based on
the Program is not required to print an announcement.)
-
+
These requirements apply to the modified work as a whole. If
identifiable sections of that work are not derived from the Program,
and can be reasonably considered independent and separate works in
@@ -168,7 +168,7 @@ access to copy from a designated place, then offering equivalent
access to copy the source code from the same place counts as
distribution of the source code, even though third parties are not
compelled to copy the source along with the object code.
-
+
4. You may not copy, modify, sublicense, or distribute the Program
except as expressly provided under this License. Any attempt
otherwise to copy, modify, sublicense or distribute the Program is
@@ -225,7 +225,7 @@ impose that choice.
This section is intended to make thoroughly clear what is believed to
be a consequence of the rest of this License.
-
+
8. If the distribution and/or use of the Program is restricted in
certain countries either by patents or by copyrighted interfaces, the
original copyright holder who places the Program under this License
@@ -255,7 +255,7 @@ make exceptions for this. Our decision will be guided by the two goals
of preserving the free status of all derivatives of our free software and
of promoting the sharing and reuse of software generally.
- NO WARRANTY
+ NO WARRANTY
11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN
@@ -277,9 +277,9 @@ YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
POSSIBILITY OF SUCH DAMAGES.
- END OF TERMS AND CONDITIONS
-
- How to Apply These Terms to Your New Programs
+ END OF TERMS AND CONDITIONS
+
+ How to Apply These Terms to Your New Programs
If you develop a new program, and you want it to be of the greatest
possible use to the public, the best way to achieve this is to make it
@@ -303,17 +303,16 @@ the "copyright" line and a pointer to where the full notice is found.
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
- You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software
- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-
+ You should have received a copy of the GNU General Public License along
+ with this program; if not, write to the Free Software Foundation, Inc.,
+ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
Also add information on how to contact you by electronic and paper mail.
If the program is interactive, make it output a short notice like this
when it starts in an interactive mode:
- Gnomovision version 69, Copyright (C) year name of author
+ Gnomovision version 69, Copyright (C) year name of author
Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
This is free software, and you are welcome to redistribute it
under certain conditions; type `show c' for details.
@@ -336,5 +335,5 @@ necessary. Here is a sample; alter the names:
This General Public License does not permit incorporating your program into
proprietary programs. If your program is a subroutine library, you may
consider it more useful to permit linking proprietary applications with the
-library. If this is what you want to do, use the GNU Library General
+library. If this is what you want to do, use the GNU Lesser General
Public License instead of this License.
13 years, 7 months
Changes to 'refs/tags/spacewalk-reports-1.2.3-1'
by Jan Pazdziora
Tag 'spacewalk-reports-1.2.3-1' created by Jan Pazdziora <jpazdziora(a)redhat.com> at 2010-09-20 07:48 +0000
Tagging package [spacewalk-reports] version [1.2.3-1] in directory [reporting/].
Changes since spacewalk-java-1.2.41-1:
Jan Pazdziora (3):
Bring back the 2010 copyright year which was lost in commit 92f09ae169b6697ae9ed2053ee99cea716e1fd88 by accident.
634961 - stop null/None values from being presented as "None".
Automatic commit of package [spacewalk-reports] release [1.2.3-1].
Justin Sherrill (1):
633956 -fixing error popup on YourRhn when a warning or critical probe exists
Lukas Zapletal (1):
fixed NPE when spacewalk_reposync_logpath is set to nonexisting dir
ypoyarko (1):
l10n: Updates to Russian (ru) translation
---
client/rhel/rhn-client-tools/po/ru.po | 96 +++++-----
java/code/src/com/redhat/rhn/frontend/taglibs/list/ListTag.java | 18 +
java/code/src/com/redhat/rhn/frontend/taglibs/list/ListTagHelper.java | 4
java/code/src/com/redhat/rhn/manager/channel/ChannelManager.java | 6
rel-eng/packages/spacewalk-reports | 2
reporting/spacewalk-report | 9
reporting/spacewalk-reports.spec | 5
7 files changed, 78 insertions(+), 62 deletions(-)
---
13 years, 7 months
rel-eng/packages reporting/spacewalk-reports.spec
by Jan Pazdziora
rel-eng/packages/spacewalk-reports | 2 +-
reporting/spacewalk-reports.spec | 5 ++++-
2 files changed, 5 insertions(+), 2 deletions(-)
New commits:
commit 7093efd25592b4840602ab5d052e807da1ecaeec
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Mon Sep 20 09:48:32 2010 +0200
Automatic commit of package [spacewalk-reports] release [1.2.3-1].
diff --git a/rel-eng/packages/spacewalk-reports b/rel-eng/packages/spacewalk-reports
index 65b8dc9..ff304e9 100644
--- a/rel-eng/packages/spacewalk-reports
+++ b/rel-eng/packages/spacewalk-reports
@@ -1 +1 @@
-1.2.2-1 reporting/
+1.2.3-1 reporting/
diff --git a/reporting/spacewalk-reports.spec b/reporting/spacewalk-reports.spec
index 3df0dd4..5cc2247 100644
--- a/reporting/spacewalk-reports.spec
+++ b/reporting/spacewalk-reports.spec
@@ -2,7 +2,7 @@ Name: spacewalk-reports
Summary: Script based reporting
Group: Applications/Internet
License: GPLv2
-Version: 1.2.2
+Version: 1.2.3
Release: 1%{?dist}
URL: https://fedorahosted.org/spacewalk
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
@@ -42,6 +42,9 @@ rm -rf $RPM_BUILD_ROOT
%{_mandir}/man8/spacewalk-report.8*
%changelog
+* Mon Sep 20 2010 Jan Pazdziora 1.2.3-1
+- 634961 - stop null/None values from being presented as "None".
+
* Wed Aug 18 2010 Jan Pazdziora 1.2.2-1
- 623941, 578292 - add report channel-packages which provides full list
of packages in channels.
13 years, 7 months
reporting/spacewalk-report
by Jan Pazdziora
reporting/spacewalk-report | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
New commits:
commit c2887fb7c6d7a2aa986d3e5a7e63e4c487624043
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Mon Sep 20 09:48:05 2010 +0200
634961 - stop null/None values from being presented as "None".
diff --git a/reporting/spacewalk-report b/reporting/spacewalk-report
index 7dd6ab4..8b6978b 100755
--- a/reporting/spacewalk-report
+++ b/reporting/spacewalk-report
@@ -163,7 +163,12 @@ if __name__ == '__main__':
break
if outrow == None:
- outrow = [ str(x) for x in row ]
+ outrow = []
+ for x in row:
+ if x is None:
+ outrow.append(None)
+ else:
+ outrow.append(str(x))
multival_dupes = {}
prevrow = row
13 years, 7 months
reporting/spacewalk-report
by Jan Pazdziora
reporting/spacewalk-report | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 27e1229d1a70c2c9bdd8a27b492fd252ed02fc69
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Mon Sep 20 09:29:46 2010 +0200
Bring back the 2010 copyright year which was lost in commit 92f09ae169b6697ae9ed2053ee99cea716e1fd88 by accident.
diff --git a/reporting/spacewalk-report b/reporting/spacewalk-report
index 14e404a..7dd6ab4 100755
--- a/reporting/spacewalk-report
+++ b/reporting/spacewalk-report
@@ -1,6 +1,6 @@
#!/usr/bin/python -u
#
-# Copyright (c) 2008 Red Hat, Inc.
+# 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
13 years, 7 months
java/code
by Lukas Zapletal
java/code/src/com/redhat/rhn/manager/channel/ChannelManager.java | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
New commits:
commit 7db832383c8b9e2b6b5d258a15be08918716b32a
Author: Lukas Zapletal <lzap+git(a)redhat.com>
Date: Mon Sep 20 09:23:21 2010 +0200
fixed NPE when spacewalk_reposync_logpath is set to nonexisting dir
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 397a8e2..3f4c6c3 100644
--- a/java/code/src/com/redhat/rhn/manager/channel/ChannelManager.java
+++ b/java/code/src/com/redhat/rhn/manager/channel/ChannelManager.java
@@ -2825,7 +2825,11 @@ public class ChannelManager extends BaseManager {
File dir = new File(logPath);
List<String> possibleList = new ArrayList<String>();
- for (String file : dir.list()) {
+ String[] dirList = dir.list();
+ if (dirList == null) {
+ return null; // the log directory does not exist
+ }
+ for (String file : dirList) {
if (file.contains(c.getLabel())) {
possibleList.add(file);
}
13 years, 7 months
client/rhel
by Transifex System User
client/rhel/rhn-client-tools/po/ru.po | 96 +++++++++++++++++-----------------
1 file changed, 49 insertions(+), 47 deletions(-)
New commits:
commit 453cc793d7b5b35b6d4c66ebb9cc65b944a6b034
Author: ypoyarko <ypoyarko(a)fedoraproject.org>
Date: Mon Sep 20 07:19:27 2010 +0000
l10n: Updates to Russian (ru) translation
Transmitted-via: Transifex (translate.fedoraproject.org)
diff --git a/client/rhel/rhn-client-tools/po/ru.po b/client/rhel/rhn-client-tools/po/ru.po
index 47754a6..9768a05 100644
--- a/client/rhel/rhn-client-tools/po/ru.po
+++ b/client/rhel/rhn-client-tools/po/ru.po
@@ -11,8 +11,8 @@ msgstr ""
"Project-Id-Version: ru\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2010-05-07 13:34+0200\n"
-"PO-Revision-Date: 2010-09-01 16:09+1000\n"
-"Last-Translator: \n"
+"PO-Revision-Date: 2010-09-20 17:17\n"
+"Last-Translator: Yulia <ypoyarko(a)redhat.com>\n"
"Language-Team: Russian\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -223,7 +223,7 @@ msgstr "Прокси задан на %s."
#. Start Window
#: ../src/up2date_client/rhnreg_constants.py:22
msgid "Setting up Software updates"
-msgstr "Настройка обновлений ПО"
+msgstr "Настройка обновлений"
#: ../src/up2date_client/rhnreg_constants.py:23
msgid ""
@@ -237,13 +237,13 @@ msgid ""
" * The location of a Red Hat Network Satellite or Proxy (optional)\n"
"\n"
msgstr ""
-"Помощник выполнит пошаговое подключение вашей системы к Red Hat Network "
+"Помощник поможет подключить систему к Red Hat Network "
"(RHN) для получения обновлений ПО, включая обновления безопасности для "
-"обеспечения защиты системы. Для этого необходимо:\n"
+"поддержки защиты системы. Для этого необходимо:\n"
"\n"
-" * сетевое соединение;\n"
-" * имя входа и пароль Red Hat;\n"
-" * данные о расположении Red Hat Network Satellite или Proxy (необязательно).\n"
+" * Сетевое соединение\n"
+" * Имя входа и пароль Red Hat\n"
+" * Адрес Red Hat Network Satellite или Proxy (необязательно)\n"
"\n"
#. Why Register Window
@@ -285,7 +285,8 @@ msgid ""
"this Red Hat Enterprise Linux system updated and secure."
msgstr ""
"Получайте последние обновления ПО, включая обновления безопасности, тем "
-"самым поддерживая систему Red Hat Enterprise Linux в обновлённом и защищенном состоянии."
+"самым поддерживая Red Hat Enterprise Linux в обновлённом и защищённом "
+"состоянии."
#: ../src/up2date_client/rhnreg_constants.py:46 ../data/rh_register.glade.h:47
msgid ""
@@ -351,7 +352,7 @@ msgstr "Зарегистрируюсь позже"
#. Info Window
#: ../src/up2date_client/rhnreg_constants.py:68
msgid "Setting up software updates"
-msgstr "Настройка обновлений ПО"
+msgstr "Настройка обновлений"
#: ../src/up2date_client/rhnreg_constants.py:69
#, python-format
@@ -446,12 +447,12 @@ msgid ""
"in chapter 6 of the RHN Reference Guide, available from the 'Help' button in "
"the main Red Hat Network web interface.)"
msgstr ""
-"Можно выполнить «yum update» в командной строке для получения последних "
-"обновлений ПО с Red Hat Network. Выполняйте команду регулярно для "
-"поддержки системы в обновленном состоянии. Также можно настроить "
+"Для получения последних программных обновлений из Red Hat Network "
+"можно выполнить «yum update» в командной строке. Выполняйте команду регулярно для "
+"поддержания системы в обновлённом состоянии. Также можно настроить "
"автоматическое выполнение обновлений («auto errata update») через интерфейс "
"Red Hat Network (инструкции в главе 6 справочного руководства RHN, "
-"доступного через меню справки в главном окне интерфейса Red Hat Network)."
+"доступного через меню справки в главном окне Red Hat Network)."
#. Review Window
#: ../src/up2date_client/rhnreg_constants.py:109 ../data/gui.glade.h:6
@@ -541,18 +542,18 @@ msgid ""
"may browse to this system's profile in the RHN web interface and subscribe "
"this system to software channels via the software > software channels tab."
msgstr ""
-"Система не смогла подписаться на каналы ПО. Она не сможет "
-"поддерживаться в обновленном и защищённом состоянии. Следующие шаги могут "
+"Система не смогла подписаться на какие-либо каналы ПО. Она не сможет "
+"поддерживаться в обновленном и защищенном состоянии. Следующие шаги могут "
"помочь в решении этой проблемы:\n"
-"1) Выполните вход в http://rhn.redhat.com/ и отмените все полномочия для "
-"неактивной системы в меню «Ваша RHN > Управление подпиской > Полномочия "
-"системы».\n"
-"2) Приобретите дополнительную подписку Red Hat Enterprise Linux на http://"
+"(1) Выполните вход в http://rhn.redhat.com/ и отмените все полномочия для "
+"неактивной системы через Ваша RHN > Управление подпиской > Полномочия "
+"системы.\n"
+"(2) Приобретите дополнительную подписку Red Hat Enterprise Linux на http://"
"www.redhat.com/store/.\n"
-"3) Активируйте новый код установки на http://www.redhat.com/now/. Как "
+"(3) Активируйте новый код установки на http://www.redhat.com/now/. Как "
"только новые подписки будут доступны вашей учетной записи, вы можете перейти "
"к просмотру системного профиля в интерфейсе RHN и подписать систему на "
-"каналы ПО на вкладке «ПО > Каналы ПО»."
+"каналы ПО на вкладке ПО > Каналы ПО."
#: ../src/up2date_client/rhnreg_constants.py:155
msgid "RHN service level:"
@@ -580,7 +581,9 @@ msgstr ""
msgid ""
"Update module: per-system updates, email errata notifications, errata "
"information"
-msgstr "Модуль обновления: обновления ПО для отдельных систем, уведомления об исправлениях по электронной почте, информация об исправлениях"
+msgstr ""
+"Модуль обновления: обновления ПО для отдельных систем, исправления "
+"уведомлений эл.почты, информация об исправлениях"
#: ../src/up2date_client/rhnreg_constants.py:165
msgid ""
@@ -711,12 +714,12 @@ msgid ""
msgstr ""
"Не удалось связаться с сервером Red Hat Network.\n"
"\n"
-"Проверьте правильность введённого пути: «%s».\n"
-"Если требуется, исправьте ошибки и повторите попытку.\n"
+"Проверьте путь: «%s».\n"
+"Если указан неверный путь, исправьте и повторите попытку.\n"
"\n"
"Проверьте сетевое подключение.\n"
"\n"
-"Данная система не сможет получать обновления ПО Red Hat без подключения к "
+"Данная система не сможет получать обновления Red Hat без подключения к "
"серверу Red Hat Network"
#: ../src/up2date_client/rhnreg_constants.py:221
@@ -729,7 +732,7 @@ msgid ""
"This server doesn't support functionality needed by this version of the "
"software update setup client. Please try again with a newer server."
msgstr ""
-"Сервер не поддерживает функциональность, необходимую для данной версии "
+"Сервер не поддерживает функциональность, необходимую для данной версией "
"клиента настройки обновлений ПО. Повторите попытку с более поздней версией "
"сервера."
@@ -1536,7 +1539,7 @@ msgstr "Просмотр подписки"
#: ../src/firstboot/rhn_start_gui.py:39
msgid "Set Up Software Updates"
-msgstr "Настроить обновления ПО"
+msgstr "Настройка обновлений"
#: ../src/bin/rhn-profile-sync.py:34
msgid ""
@@ -1729,7 +1732,7 @@ msgstr "<b>ID системы:</b>"
msgid ""
"<b>The network connection on your system is not active. Your system cannot "
"be set up for software updates at this time.</b>"
-msgstr "<b>В системе нет активного сетевого соединения. Получение обновлений ПО не может быть настроено.</b>"
+msgstr "<b>Не обнаружено активное сетевое соединение. Получение программных обновлений не может быть настроено.</b>"
#: ../data/rh_register.glade.h:13
msgid ""
@@ -1768,7 +1771,9 @@ msgid ""
"<b>_Limited updates</b> will be provided to this system to maintain "
"compatibility with the following eligible Red Hat Enterprise Linux minor "
"release software channel:"
-msgstr "<b>О_граниченные обновления</b> будут предоставлены этой системе с целью обеспечения совместимости со следующим каналом ПО вспомогательного выпуска Red Hat Enterprise Linux:"
+msgstr ""
+"<b>О_граниченные обновления</b> будут предоставлены с целью поддержки "
+"совместимости со следующими программными каналами Red Hat Enterprise Linux:"
#: ../data/rh_register.glade.h:19
msgid "<big><b>Moving to earlier releases won't be possible</b></big>"
@@ -1996,7 +2001,7 @@ msgid ""
"this Red Hat Enterprise Linux system <b>updated</b> and <b>secure</b>."
msgstr ""
"Получайте последние обновления ПО, включая обновления безопасности, тем "
-"самым поддерживая систему Red Hat Enterprise Linux в <b>обновлённом</b> и "
+"самым поддерживая Red Hat Enterprise Linux в <b>обновлённом</b> и "
"<b>защищённом</b> состоянии."
#: ../data/rh_register.glade.h:73
@@ -2025,7 +2030,7 @@ msgstr "Передать профиль п_акетов"
#: ../data/rh_register.glade.h:79
msgid "Software update setup has been completed for this system."
-msgstr "Настройка обновлений ПО завершена."
+msgstr "Настройка программных обновлений завершена."
#: ../data/rh_register.glade.h:80
msgid "Start Window"
@@ -2054,13 +2059,10 @@ msgid ""
"by running <b>Software Updater</b> in the <b>Applications > System Tools</b> "
"menu."
msgstr ""
-"Без подключения к серверу Red Hat Network вы <b>не</b> сможете получать "
-"обновления ПО, в том числе обновления безопасности Red Hat для данной "
-"системы.\n"
+"Без подключения к серверу Red Hat Network получение программных обновлений (в том числе обновлений безопасности Red Hat) будет <b>невозможно</b>.\n"
"\n"
-"Для поддержания системы в обновлённом и защищённом состоянии "
-"зарегистрируйте её как можно раньше. Доступ к программе регистрации возможен "
-"через запуск <b>Обновление пакетов</b> в меню <b>Приложения > Система</b>. "
+"Для поддержки системы в обновлённом и защищённом состоянии "
+"рекомендуется её зарегистрировать. Для запуска программы регистрации в меню <b>Приложения > Система</b> выберите <b>Обновление пакетов</b>."
#: ../data/rh_register.glade.h:88
msgid "Use Au_thentication with HTTP Proxy:"
@@ -2086,7 +2088,7 @@ msgid ""
"com/) or to a <b>Red Hat Network Satellite</b> or <b>Red Hat Network Proxy</"
"b> in order to receive software updates."
msgstr ""
-"Вы можете подключить систему к <b>Red Hat Network</b> (https://rhn."
+"Вы можете подключить свою систему к <b>Red Hat Network</b> (https://rhn."
"redhat.com/), <b>Red Hat Network Satellite</b> или <b>Red Hat Network Proxy</"
"b> для получения обновлений ПО."
@@ -2108,12 +2110,11 @@ msgid ""
"updates setup tool at any time by running Software Updater in the "
"Applications > System Tools menu."
msgstr ""
-"Вы не сможете получать обновления ПО, в том числе обновления безопасности "
-"для данной системы.\n"
+"Получение программных обновлений для этой системы (в том числе обновлений безопасности) будет невозможно.\n"
"\n"
"Для поддержания системы в обновлённом и защищённом состоянии "
-"зарегистрируйте её в RHN как можно раньше. Доступ к программе регистрации "
-"возможен через запуск «Обновление пакетов» в меню «Приложения > Система»."
+"зарегистрируйте её в RHN. Доступ к программе регистрации "
+"возможен через запуск «Обновление программ» в меню «Приложения > Система»."
#: ../data/rh_register.glade.h:98
msgid ""
@@ -2145,11 +2146,12 @@ msgid ""
"circled below.) Clicking on this icon, when available, will guide you "
"through applying any updates that are available:"
msgstr ""
-"Система готова к получению обновлений ПО, которые обеспечат её безопасность "
-"и поддержку.\n"
+"Система готова к получению обновлений, которые обеспечат ее защиту и "
+"поддержку.\n"
"\n"
-"Индикатором наличия программных обновлений служит появление значка уведомления на рабочем столе (обычно в правом верхнем углу). "
-"Нажмите этот значок, чтобы начать пошаговую установку обновлений:"
+"Если на рабочем столе появился значок уведомления (обычно в правом верхнем "
+"углу), это означает о доступности программных обновлений. При нажатии этого "
+"значка начнется пошаговая установка обновлений:"
#: ../data/rh_register.glade.h:104
msgid ""
13 years, 7 months