Changes to 'refs/tags/rhnclient-5.5.1-1'
by Michael Mraka
Tag 'rhnclient-5.5.1-1' created by Michael Mraka <michael.mraka(a)redhat.com> at 2012-11-26 12:02 +0000
Tagging package [rhnclient] version [5.5.1-1] in directory [client/solaris/rhnclient/].
Changes since spacewalk-java-1.9.17-1:
Michael Mraka (2):
let's reset version above satellite version
Automatic commit of package [rhnclient] release [5.5.1-1].
Milan Zazrivec (1):
877451 - correct the proxy configuration logic
---
backend/satellite_tools/repo_plugins/yum_src.py | 4 ++--
client/solaris/rhnclient/rhnclient.spec | 5 ++++-
client/solaris/rhnclient/setup.py | 2 +-
rel-eng/packages/rhnclient | 2 +-
4 files changed, 8 insertions(+), 5 deletions(-)
---
11 years, 5 months
2 commits - client/solaris rel-eng/packages
by Michael Mraka
client/solaris/rhnclient/rhnclient.spec | 5 ++++-
client/solaris/rhnclient/setup.py | 2 +-
rel-eng/packages/rhnclient | 2 +-
3 files changed, 6 insertions(+), 3 deletions(-)
New commits:
commit 4ff8dfbba358c6438020c993ee7af2e8b90d408a
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Mon Nov 26 13:02:21 2012 +0100
Automatic commit of package [rhnclient] release [5.5.1-1].
diff --git a/client/solaris/rhnclient/rhnclient.spec b/client/solaris/rhnclient/rhnclient.spec
index 7b81e74..27810ac 100644
--- a/client/solaris/rhnclient/rhnclient.spec
+++ b/client/solaris/rhnclient/rhnclient.spec
@@ -5,8 +5,8 @@
Summary: Red Hat Network Client Utilities and Libraries
Name: rhnclient
Source0: %{name}-%{version}.tar.gz
-Version: 5.5.0
-Release: 0
+Version: 5.5.1
+Release: 1
License: GPLv2
Group: Development/Libraries
BuildRoot: %{_tmppath}/%{name}-buildroot
@@ -64,6 +64,9 @@ rm -rf $RPM_BUILD_ROOT
#%doc ChangeLog COPYING README TODO
%changelog
+* Mon Nov 26 2012 Michael Mraka <michael.mraka(a)redhat.com> 5.5.1-1
+- let's reset version above satellite version
+
* Tue Oct 30 2012 Jan Pazdziora 0.19-1
- Update the copyright year.
diff --git a/client/solaris/rhnclient/setup.py b/client/solaris/rhnclient/setup.py
index 6d55cdd..bdf4bd0 100644
--- a/client/solaris/rhnclient/setup.py
+++ b/client/solaris/rhnclient/setup.py
@@ -6,7 +6,7 @@
from distutils.core import setup
setup(name = "rhnclient",
- version = "0.19",
+ version = "5.5.1",
description = "Red Hat Network Client Utilities and Libraries",
long_description = """\
Red Hat Network Client Utilities
diff --git a/rel-eng/packages/rhnclient b/rel-eng/packages/rhnclient
index 4844579..9a2ba9a 100644
--- a/rel-eng/packages/rhnclient
+++ b/rel-eng/packages/rhnclient
@@ -1 +1 @@
-0.19-1 client/solaris/rhnclient/
+5.5.1-1 client/solaris/rhnclient/
commit d47e125c09c8626f3c614a7792ae33ad874489f3
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Mon Nov 26 12:03:30 2012 +0100
let's reset version above satellite version
diff --git a/client/solaris/rhnclient/rhnclient.spec b/client/solaris/rhnclient/rhnclient.spec
index 2db0ed2..7b81e74 100644
--- a/client/solaris/rhnclient/rhnclient.spec
+++ b/client/solaris/rhnclient/rhnclient.spec
@@ -5,8 +5,8 @@
Summary: Red Hat Network Client Utilities and Libraries
Name: rhnclient
Source0: %{name}-%{version}.tar.gz
-Version: 0.19
-Release: 1
+Version: 5.5.0
+Release: 0
License: GPLv2
Group: Development/Libraries
BuildRoot: %{_tmppath}/%{name}-buildroot
11 years, 5 months
backend/satellite_tools
by Milan Zazrivec
backend/satellite_tools/repo_plugins/yum_src.py | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
New commits:
commit 1bfe1a375df5049c79d5a577d910bc41305ddc68
Author: Milan Zazrivec <mzazrivec(a)redhat.com>
Date: Mon Nov 26 11:51:57 2012 +0100
877451 - correct the proxy configuration logic
diff --git a/backend/satellite_tools/repo_plugins/yum_src.py b/backend/satellite_tools/repo_plugins/yum_src.py
index 481ecf9..145476c 100644
--- a/backend/satellite_tools/repo_plugins/yum_src.py
+++ b/backend/satellite_tools/repo_plugins/yum_src.py
@@ -130,8 +130,8 @@ class ContentSource(object):
fileutils.makedirs(pkgdir, user='apache', group='apache')
repo.pkgdir = pkgdir
- if ((repo.cfg.has_section(self.name) and not repo.cfg.has_option(self.name, 'proxy')) or
- (repo.cfg.has_section('main') and not repo.cfg.has_option('main', 'proxy'))) and \
+ if not ((repo.cfg.has_section(self.name) and repo.cfg.has_option(self.name, 'proxy')) or
+ (repo.cfg.has_section('main') and repo.cfg.has_option('main', 'proxy'))) and \
self.proxy_addr is not None:
repo.proxy = "http://%s" % self.proxy_addr
repo.proxy_username = self.proxy_user
11 years, 5 months
Changes to 'refs/tags/spacewalk-java-1.9.17-1'
by Tomas Lestach
Tag 'spacewalk-java-1.9.17-1' created by Tomas Lestach <tlestach(a)redhat.com> at 2012-11-23 16:26 +0000
Tagging package [spacewalk-java] version [1.9.17-1] in directory [java/].
Changes since spacewalk-search-1.9.1-1:
Nigel Jones (1):
879443 - preserve product name when cloning channels using API
Tomas Lestach (1):
Automatic commit of package [spacewalk-java] release [1.9.17-1].
---
java/code/src/com/redhat/rhn/domain/channel/NewChannelHelper.java | 9 +++++++++
java/code/src/com/redhat/rhn/frontend/xmlrpc/channel/software/ChannelSoftwareHandler.java | 1 +
java/spacewalk-java.spec | 8 +++++++-
rel-eng/packages/spacewalk-java | 2 +-
4 files changed, 18 insertions(+), 2 deletions(-)
---
11 years, 5 months
2 commits - java/code java/spacewalk-java.spec rel-eng/packages
by Tomas Lestach
java/code/src/com/redhat/rhn/domain/channel/NewChannelHelper.java | 9 +++++++++
java/code/src/com/redhat/rhn/frontend/xmlrpc/channel/software/ChannelSoftwareHandler.java | 1 +
java/spacewalk-java.spec | 8 +++++++-
rel-eng/packages/spacewalk-java | 2 +-
4 files changed, 18 insertions(+), 2 deletions(-)
New commits:
commit e400e8108499f5e295a0f5df05620096e26a2997
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Fri Nov 23 17:26:45 2012 +0100
Automatic commit of package [spacewalk-java] release [1.9.17-1].
diff --git a/java/spacewalk-java.spec b/java/spacewalk-java.spec
index 295b7f4..0b1b141 100644
--- a/java/spacewalk-java.spec
+++ b/java/spacewalk-java.spec
@@ -23,7 +23,7 @@ Name: spacewalk-java
Summary: Spacewalk Java site packages
Group: Applications/Internet
License: GPLv2
-Version: 1.9.16
+Version: 1.9.17
Release: 1%{?dist}
URL: https://fedorahosted.org/spacewalk
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
@@ -617,6 +617,12 @@ fi
%{jardir}/postgresql-jdbc.jar
%changelog
+* Fri Nov 23 2012 Tomas Lestach <tlestach(a)redhat.com> 1.9.17-1
+- 879443 - preserve product name when cloning channels using API
+- Implement new API call system.listAllInstallablePackages
+- Fix query for API call system.listLatestInstallablePackages
+- 798571 - Moscow time is GMT+4.
+
* Thu Nov 22 2012 Jan Pazdziora 1.9.16-1
- Fixing checkstyle.
diff --git a/rel-eng/packages/spacewalk-java b/rel-eng/packages/spacewalk-java
index e7a5837..ff26caa 100644
--- a/rel-eng/packages/spacewalk-java
+++ b/rel-eng/packages/spacewalk-java
@@ -1 +1 @@
-1.9.16-1 java/
+1.9.17-1 java/
commit 75c9bec2e4cf450338ba018961eb9f780d9f693b
Author: Nigel Jones <nigjones(a)redhat.com>
Date: Fri Nov 23 16:49:49 2012 +0100
879443 - preserve product name when cloning channels using API
similar to the perl channel clone code
diff --git a/java/code/src/com/redhat/rhn/domain/channel/NewChannelHelper.java b/java/code/src/com/redhat/rhn/domain/channel/NewChannelHelper.java
index 5640cd6..9b02294 100644
--- a/java/code/src/com/redhat/rhn/domain/channel/NewChannelHelper.java
+++ b/java/code/src/com/redhat/rhn/domain/channel/NewChannelHelper.java
@@ -48,6 +48,7 @@ public class NewChannelHelper {
private String gpgUrl;
private String gpgFingerprint;
private String description;
+ private ProductName productName;
/**
* Creates a cloned channel based off the info contained within this object
@@ -101,6 +102,7 @@ public class NewChannelHelper {
cloned.setOrg(user.getOrg());
cloned.setBaseDir("/dev/null"); //this is how the perl code did it
cloned.setOriginal(toClone);
+ cloned.setProductName(productName);
if (parent != null) {
cloned.setParentChannel(parent);
@@ -289,6 +291,13 @@ public class NewChannelHelper {
}
/**
+ * @param productNameIn Product name to set.
+ */
+ public void setProductName(ProductName productNameIn) {
+ this.productName = productNameIn;
+ }
+
+ /**
* @param summaryIn The summary to set.
*/
public void setSummary(String summaryIn) {
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 f31e854..1c4995f 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
@@ -1994,6 +1994,7 @@ public class ChannelSoftwareHandler extends BaseHandler {
helper.setParent(parent);
helper.setUser(loggedInUser);
helper.setSummary(summary);
+ helper.setProductName(originalChan.getProductName());
Channel clone = helper.clone(originalState.booleanValue(), originalChan);
ChannelManager.cloneNewestPackages(originalChan.getId(), clone, "api");
11 years, 5 months
Changes to 'refs/tags/spacewalk-search-1.9.1-1'
by Jan Pazdziora
Tag 'spacewalk-search-1.9.1-1' created by Jan Pazdziora <jpazdziora(a)redhat.com> at 2012-11-23 14:11 +0000
Tagging package [spacewalk-search] version [1.9.1-1] in directory [search-server/spacewalk-search/].
Changes since spacewalk-java-1.9.16-1:
Jan Pazdziora (3):
798571 - Moscow time is GMT+4.
Store search indexes in /var.
Automatic commit of package [spacewalk-search] release [1.9.1-1].
Johannes Renner (2):
Fix query for API call system.listLatestInstallablePackages
Implement new API call system.listAllInstallablePackages
Pierre Casenove (1):
838033 - Remove use of ZipFile object to avoid ZipFile 64 extension missing in python 2.4
---
client/solaris/smartpm/smart/backends/solaris/pm.py | 11 -
java/code/src/com/redhat/rhn/common/db/datasource/xml/Package_queries.xml | 57 +++++++---
java/code/src/com/redhat/rhn/frontend/strings/database/StringResource_bn_IN.xml | 4
java/code/src/com/redhat/rhn/frontend/strings/database/StringResource_de.xml | 4
java/code/src/com/redhat/rhn/frontend/strings/database/StringResource_en_US.xml | 2
java/code/src/com/redhat/rhn/frontend/strings/database/StringResource_es.xml | 4
java/code/src/com/redhat/rhn/frontend/strings/database/StringResource_fr.xml | 4
java/code/src/com/redhat/rhn/frontend/strings/database/StringResource_gu.xml | 4
java/code/src/com/redhat/rhn/frontend/strings/database/StringResource_hi.xml | 4
java/code/src/com/redhat/rhn/frontend/strings/database/StringResource_it.xml | 4
java/code/src/com/redhat/rhn/frontend/strings/database/StringResource_ja.xml | 4
java/code/src/com/redhat/rhn/frontend/strings/database/StringResource_ko.xml | 4
java/code/src/com/redhat/rhn/frontend/strings/database/StringResource_pa.xml | 4
java/code/src/com/redhat/rhn/frontend/strings/database/StringResource_pt_BR.xml | 4
java/code/src/com/redhat/rhn/frontend/strings/database/StringResource_ru.xml | 4
java/code/src/com/redhat/rhn/frontend/strings/database/StringResource_ta.xml | 4
java/code/src/com/redhat/rhn/frontend/strings/database/StringResource_zh_CN.xml | 4
java/code/src/com/redhat/rhn/frontend/strings/database/StringResource_zh_TW.xml | 4
java/code/src/com/redhat/rhn/frontend/xmlrpc/system/SystemHandler.java | 29 +++++
java/code/src/com/redhat/rhn/manager/system/SystemManager.java | 16 ++
rel-eng/packages/spacewalk-search | 2
search-server/spacewalk-search/spacewalk-search.spec | 39 ++++++
search-server/spacewalk-search/src/config/search/rhn_search.conf | 2
search-server/spacewalk-search/src/java/com/redhat/satellite/search/index/IndexManager.java | 2
search-server/spacewalk-search/src/java/com/redhat/satellite/search/index/tests/IndexManagerTest.java | 2
25 files changed, 161 insertions(+), 61 deletions(-)
---
11 years, 5 months
rel-eng/packages search-server/spacewalk-search
by Jan Pazdziora
rel-eng/packages/spacewalk-search | 2 +-
search-server/spacewalk-search/spacewalk-search.spec | 5 ++++-
2 files changed, 5 insertions(+), 2 deletions(-)
New commits:
commit 1bbb1ae4871ef0a5b1d96f632991dbcd742cce18
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Fri Nov 23 15:11:36 2012 +0100
Automatic commit of package [spacewalk-search] release [1.9.1-1].
diff --git a/rel-eng/packages/spacewalk-search b/rel-eng/packages/spacewalk-search
index 3e300a8..4a19829 100644
--- a/rel-eng/packages/spacewalk-search
+++ b/rel-eng/packages/spacewalk-search
@@ -1 +1 @@
-1.8.6-1 search-server/spacewalk-search/
+1.9.1-1 search-server/spacewalk-search/
diff --git a/search-server/spacewalk-search/spacewalk-search.spec b/search-server/spacewalk-search/spacewalk-search.spec
index ad532a7..cd40c09 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.9.0
+Version: 1.9.1
Release: 1%{?dist}
# This src.rpm is cannonical upstream
# You can obtain it using this set of commands
@@ -154,6 +154,9 @@ fi
%attr(755, root, root) %{_var}/lib/rhn/search/indexes/docs
%changelog
+* Fri Nov 23 2012 Jan Pazdziora 1.9.1-1
+- Store search indexes in /var.
+
* Tue Oct 30 2012 Jan Pazdziora 1.8.6-1
- Update the copyright year.
11 years, 5 months
search-server/spacewalk-search
by Jan Pazdziora
search-server/spacewalk-search/spacewalk-search.spec | 34 +++++++++-
search-server/spacewalk-search/src/config/search/rhn_search.conf | 2
search-server/spacewalk-search/src/java/com/redhat/satellite/search/index/IndexManager.java | 2
search-server/spacewalk-search/src/java/com/redhat/satellite/search/index/tests/IndexManagerTest.java | 2
4 files changed, 35 insertions(+), 5 deletions(-)
New commits:
commit 971e0b9b1357f4e77ea9ee194ea5ae0f4f5d5f4b
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Fri Nov 23 14:07:45 2012 +0100
Store search indexes in /var.
diff --git a/search-server/spacewalk-search/spacewalk-search.spec b/search-server/spacewalk-search/spacewalk-search.spec
index 6258904..ad532a7 100644
--- a/search-server/spacewalk-search/spacewalk-search.spec
+++ b/search-server/spacewalk-search/spacewalk-search.spec
@@ -83,8 +83,10 @@ rm -fr ${RPM_BUILD_ROOT}
ant -Djar.version=%{version} install
install -d -m 755 $RPM_BUILD_ROOT%{_prefix}/share/rhn/config-defaults
install -d -m 755 $RPM_BUILD_ROOT%{_prefix}/share/rhn/search
-install -d -m 755 $RPM_BUILD_ROOT%{_prefix}/share/rhn/search/indexes
install -d -m 755 $RPM_BUILD_ROOT%{_prefix}/share/rhn/search/lib
+install -d -m 755 $RPM_BUILD_ROOT%{_var}/lib/rhn/search
+install -d -m 755 $RPM_BUILD_ROOT%{_var}/lib/rhn/search/indexes
+ln -s -f %{_prefix}/share/rhn/search/indexes/docs $RPM_BUILD_ROOT%{_var}/lib/rhn/search/indexes/docs
install -d -m 755 $RPM_BUILD_ROOT%{_initrddir}
install -d -m 755 $RPM_BUILD_ROOT%{_bindir}
install -d -m 755 $RPM_BUILD_ROOT%{_var}/log/rhn/search
@@ -107,6 +109,32 @@ rm -rf $RPM_BUILD_ROOT
# This adds the proper /etc/rc*.d links for the script
/sbin/chkconfig --add rhn-search
+was_running=0
+if /sbin/service rhn-search status > /dev/null 2>&1 ; then
+ was_running=1
+fi
+
+# Migrate original /usr/share/rhn/search/indexes/*
+# to /var/lib/rhn/search/indexes
+cd %{_prefix}/share/rhn/search/indexes && /bin/ls | /bin/grep -v docs | while read i ; do
+ if [ ! -e %{_var}/lib/rhn/search/indexes/$i ] ; then
+ if [ $was_running -eq 1 ] ; then
+ /sbin/service rhn-search stop > /dev/null 2>&1
+ was_running=2
+ fi
+ /bin/mv $i %{_var}/lib/rhn/search/indexes/$i
+ # If the mv failed for whatever reason, symlink
+ if [ -e $i ] ; then
+ /bin/rm -rf %{_var}/lib/rhn/search/indexes/$i
+ /bin/ln -s -f %{_prefix}/share/rhn/search/indexes/$i %{_var}/lib/rhn/search/indexes/$i
+ fi
+ fi
+done
+
+if [ $was_running -eq 1 ] ; then
+ /sbin/service rhn-search status > /dev/null 2>&1 || /sbin/service rhn-search start > /dev/null 2>&1
+fi
+
%preun
if [ $1 = 0 ] ; then
/sbin/service rhn-search stop >/dev/null 2>&1
@@ -116,12 +144,14 @@ fi
%files
%attr(755, root, root) %{_var}/log/rhn/search
%{_prefix}/share/rhn/search/lib/*
-%attr(755, root, root) %{_prefix}/share/rhn/search/indexes
%attr(755, root, root) %{_initrddir}/rhn-search
%attr(755, root, root) %{_bindir}/rhnsearchd
%{_prefix}/share/rhn/config-defaults/rhn_search.conf
%{_prefix}/share/rhn/config-defaults/rhn_search_daemon.conf
%{_sysconfdir}/logrotate.d/rhn-search
+%dir %attr(755, root, root) %{_var}/lib/rhn/search
+%dir %attr(755, root, root) %{_var}/lib/rhn/search/indexes
+%attr(755, root, root) %{_var}/lib/rhn/search/indexes/docs
%changelog
* Tue Oct 30 2012 Jan Pazdziora 1.8.6-1
diff --git a/search-server/spacewalk-search/src/config/search/rhn_search.conf b/search-server/spacewalk-search/src/config/search/rhn_search.conf
index d6f0b64..34dd771 100644
--- a/search-server/spacewalk-search/src/config/search/rhn_search.conf
+++ b/search-server/spacewalk-search/src/config/search/rhn_search.conf
@@ -1,4 +1,4 @@
-search.index_work_dir=/usr/share/rhn/search/indexes
+search.index_work_dir=/var/lib/rhn/search/indexes
search.rpc_handlers=index:com.redhat.satellite.search.rpc.handlers.IndexHandler,db:com.redhat.satellite.search.rpc.handlers.DatabaseHandler,admin:com.redhat.satellite.search.rpc.handlers.AdminHandler
search.max_hits_returned=500
search.connection.driver_class=oracle.jdbc.driver.OracleDriver
diff --git a/search-server/spacewalk-search/src/java/com/redhat/satellite/search/index/IndexManager.java b/search-server/spacewalk-search/src/java/com/redhat/satellite/search/index/IndexManager.java
index 547066b..ff61b3e 100644
--- a/search-server/spacewalk-search/src/java/com/redhat/satellite/search/index/IndexManager.java
+++ b/search-server/spacewalk-search/src/java/com/redhat/satellite/search/index/IndexManager.java
@@ -189,7 +189,7 @@ public class IndexManager {
// this exception is thrown, when there're no packages or errata on the system
// and the user performs a search
// if this is the case, just return 0 results, otherwise rethrow the exception
- if (!e.getMessage().contains("no segments* file found in org.apache.lucene.store.FSDirectory@/usr/share/rhn/search/indexes")) {
+ if (!e.getMessage().contains("no segments* file found in org.apache.lucene.store.FSDirectory@/var/lib/rhn/search/indexes")) {
throw new IndexingException(e);
}
log.error(e.getMessage());
diff --git a/search-server/spacewalk-search/src/java/com/redhat/satellite/search/index/tests/IndexManagerTest.java b/search-server/spacewalk-search/src/java/com/redhat/satellite/search/index/tests/IndexManagerTest.java
index dec346b..c0f0a98 100644
--- a/search-server/spacewalk-search/src/java/com/redhat/satellite/search/index/tests/IndexManagerTest.java
+++ b/search-server/spacewalk-search/src/java/com/redhat/satellite/search/index/tests/IndexManagerTest.java
@@ -65,7 +65,7 @@ public class IndexManagerTest extends BaseTestCase {
throws IOException, IndexingException, QueryParseException {
Configuration config = TestUtil.makeConfiguration();
- config.setString("search.index_work_dir", "/usr/share/rhn/search/indexes/");
+ config.setString("search.index_work_dir", "/var/lib/rhn/search/indexes/");
IndexManager indexMgr = new IndexManager(config);
//
// TODO: Revisit how docs data gets injected for testing.
11 years, 5 months
2 commits - java/code
by Tomas Lestach
java/code/src/com/redhat/rhn/common/db/datasource/xml/Package_queries.xml | 57 +++++++---
java/code/src/com/redhat/rhn/frontend/xmlrpc/system/SystemHandler.java | 29 +++++
java/code/src/com/redhat/rhn/manager/system/SystemManager.java | 16 ++
3 files changed, 87 insertions(+), 15 deletions(-)
New commits:
commit 3ea1f31004e53925a6b8b661e86c4c647c1e86c3
Author: Johannes Renner <jrenner(a)suse.de>
Date: Thu Nov 22 14:50:57 2012 +0100
Implement new API call system.listAllInstallablePackages
diff --git a/java/code/src/com/redhat/rhn/common/db/datasource/xml/Package_queries.xml b/java/code/src/com/redhat/rhn/common/db/datasource/xml/Package_queries.xml
index af8768c..c786505 100644
--- a/java/code/src/com/redhat/rhn/common/db/datasource/xml/Package_queries.xml
+++ b/java/code/src/com/redhat/rhn/common/db/datasource/xml/Package_queries.xml
@@ -6,6 +6,30 @@
</query>
</callable-mode>
+<mode name="system_all_available_packages">
+ <query params="sid">
+SELECT PKG.id AS id,
+ PN.name AS name,
+ NVL((PEVR.evr).version, ' ') AS version,
+ NVL((PEVR.evr).release, ' ') AS release,
+ NVL((PEVR.evr).epoch, ' ') AS epoch,
+ NVL(PA.label, ' ') AS arch_label
+ FROM rhnPackage PKG
+ join rhnPackageName PN on PKG.name_id = PN.id
+ join rhnPackageEVR PEVR on PKG.evr_id = PEVR.id
+ join rhnPackageArch PA on PKG.package_arch_id = PA.id
+ join rhnChannelPackage CP on CP.package_id = PKG.id
+ join rhnServerChannel SC on SC.channel_id = CP.channel_id
+ WHERE SC.server_id = :sid
+ AND NOT EXISTS (SELECT 1
+ FROM rhnServerPackage SP
+ WHERE SP.server_id = :sid
+ AND SP.name_id = PN.id
+ AND (SP.package_arch_id = PA.id or SP.package_arch_id is null))
+ORDER BY UPPER(PN.name), PEVR.evr
+ </query>
+</mode>
+
<mode name="system_latest_available_packages">
<query params="sid">
SELECT
diff --git a/java/code/src/com/redhat/rhn/frontend/xmlrpc/system/SystemHandler.java b/java/code/src/com/redhat/rhn/frontend/xmlrpc/system/SystemHandler.java
index d3c1bba..0a40913 100644
--- a/java/code/src/com/redhat/rhn/frontend/xmlrpc/system/SystemHandler.java
+++ b/java/code/src/com/redhat/rhn/frontend/xmlrpc/system/SystemHandler.java
@@ -1137,6 +1137,35 @@ public class SystemHandler extends BaseHandler {
}
/**
+ * Get the list of all installable packages for a given system.
+ * @param sessionKey The sessionKey containing the logged in user
+ * @param sid The id for the system in question
+ * @return Returns an array of maps representing the latest installable packages
+ * @throws FaultException A FaultException is thrown if the server corresponding to
+ * sid cannot be found.
+ *
+ * @xmlrpc.doc Get the list of all installable packages for a given system.
+ * @xmlrpc.param #param("string", "sessionKey")
+ * @xmlrpc.param #param("int", "serverId")
+ * @xmlrpc.returntype
+ * #struct("package")
+ * #prop("string", "name")
+ * #prop("string", "version")
+ * #prop("string", "release")
+ * #prop("string", "epoch")
+ * #prop("int", "id")
+ * #prop("string", "arch_label")
+ * #struct_end()
+ */
+ public Object[] listAllInstallablePackages(String sessionKey, Integer sid)
+ throws FaultException {
+ User loggedInUser = getLoggedInUser(sessionKey);
+ Server server = lookupServer(loggedInUser, sid);
+ DataResult dr = SystemManager.allInstallablePackages(server.getId());
+ return dr.toArray();
+ }
+
+ /**
* Get the list of latest installable packages for a given system.
* @param sessionKey The sessionKey containing the logged in user
* @param sid The id for the system in question
diff --git a/java/code/src/com/redhat/rhn/manager/system/SystemManager.java b/java/code/src/com/redhat/rhn/manager/system/SystemManager.java
index 4f37fc7..b49c7f5 100644
--- a/java/code/src/com/redhat/rhn/manager/system/SystemManager.java
+++ b/java/code/src/com/redhat/rhn/manager/system/SystemManager.java
@@ -283,6 +283,20 @@ public class SystemManager extends BaseManager {
}
/**
+ * Get all installable packages for a given system.
+ * @param sid The id for the system we want packages for
+ * @return Return a list of all installable packages for a system.
+ */
+ public static DataResult allInstallablePackages(Long sid) {
+ SelectMode m = ModeFactory.getMode("Package_queries",
+ "system_all_available_packages",
+ Map.class);
+ Map params = new HashMap();
+ params.put("sid", sid);
+ return m.execute(params);
+ }
+
+ /**
* Gets the latest installable packages for a system
* @param sid The id for the system we want packages for
* @return Returns a list of latest installable packages for a system.
commit d3fab0add1a147849b6f2ae20b7d491a636b94fb
Author: Johannes Renner <jrenner(a)suse.de>
Date: Wed Nov 21 18:21:20 2012 +0100
Fix query for API call system.listLatestInstallablePackages
diff --git a/java/code/src/com/redhat/rhn/common/db/datasource/xml/Package_queries.xml b/java/code/src/com/redhat/rhn/common/db/datasource/xml/Package_queries.xml
index a71dfcf..af8768c 100644
--- a/java/code/src/com/redhat/rhn/common/db/datasource/xml/Package_queries.xml
+++ b/java/code/src/com/redhat/rhn/common/db/datasource/xml/Package_queries.xml
@@ -6,20 +6,19 @@
</query>
</callable-mode>
-<mode name="system_latest_all_available_packages">
+<mode name="system_latest_available_packages">
<query params="sid">
SELECT
pn.name AS name,
- full_list.id AS id,
+ pkg.id AS id,
NVL((full_list.evr).version, ' ') AS version,
NVL((full_list.evr).release, ' ') AS release,
NVL((full_list.evr).epoch, ' ') AS epoch,
NVL(full_list.arch_label, ' ') AS arch_label
FROM (
SELECT p.name_id name_id,
- p.id,
- p.evr_id,
max(pe.evr) evr,
+ pa.id as arch_id,
pa.label as arch_label
FROM rhnPackageArch PA, rhnPackageEVR PE, rhnPackage P,
rhnChannelNewestPackage CNP, rhnServerChannel SC
@@ -28,17 +27,23 @@ SELECT
AND cnp.package_id = p.id
AND p.evr_id = pe.id
AND p.package_arch_id = pa.id
- GROUP BY p.name_id, p.id, p.evr_id, pa.label
+ GROUP BY p.name_id, pa.label, pa.id
) full_list,
- rhnPackageName pn
- WHERE full_list.name_id = pn.id
- AND NOT EXISTS (SELECT 1
- FROM rhnServerPackage SP, rhnPackageEVR PE2
- WHERE SP.server_id = :sid
- AND SP.name_id = full_list.name_id
- AND SP.evr_id = PE2.id
- AND PE2.evr >= full_list.evr)
-ORDER BY UPPER(pn.name), full_list.evr
+ rhnPackage pkg
+ join rhnPackageName pn on pkg.name_id = pn.id
+ join rhnPackageEVR pevr on pkg.evr_id = pevr.id
+ join rhnChannelPackage CP on CP.package_id = pkg.id
+ join rhnServerChannel SC on SC.channel_id = CP.channel_id
+ WHERE full_list.name_id = pkg.name_id
+ AND full_list.evr = pevr.evr
+ AND full_list.arch_id = pkg.package_arch_id
+ AND SC.server_id = :sid
+ AND NOT EXISTS (SELECT 1
+ FROM rhnServerPackage SP
+ WHERE SP.server_id = :sid
+ AND SP.name_id = full_list.name_id
+ AND (SP.package_arch_id = full_list.arch_id or SP.package_arch_id is null))
+order by upper(pn.name)
</query>
</mode>
diff --git a/java/code/src/com/redhat/rhn/manager/system/SystemManager.java b/java/code/src/com/redhat/rhn/manager/system/SystemManager.java
index 96d8b65..4f37fc7 100644
--- a/java/code/src/com/redhat/rhn/manager/system/SystemManager.java
+++ b/java/code/src/com/redhat/rhn/manager/system/SystemManager.java
@@ -289,7 +289,7 @@ public class SystemManager extends BaseManager {
*/
public static DataResult latestInstallablePackages(Long sid) {
SelectMode m = ModeFactory.getMode("Package_queries",
- "system_latest_all_available_packages",
+ "system_latest_available_packages",
Map.class);
Map params = new HashMap();
params.put("sid", sid);
11 years, 5 months
java/code
by Jan Pazdziora
java/code/src/com/redhat/rhn/frontend/strings/database/StringResource_bn_IN.xml | 4 ++--
java/code/src/com/redhat/rhn/frontend/strings/database/StringResource_de.xml | 4 ++--
java/code/src/com/redhat/rhn/frontend/strings/database/StringResource_en_US.xml | 2 +-
java/code/src/com/redhat/rhn/frontend/strings/database/StringResource_es.xml | 4 ++--
java/code/src/com/redhat/rhn/frontend/strings/database/StringResource_fr.xml | 4 ++--
java/code/src/com/redhat/rhn/frontend/strings/database/StringResource_gu.xml | 4 ++--
java/code/src/com/redhat/rhn/frontend/strings/database/StringResource_hi.xml | 4 ++--
java/code/src/com/redhat/rhn/frontend/strings/database/StringResource_it.xml | 4 ++--
java/code/src/com/redhat/rhn/frontend/strings/database/StringResource_ja.xml | 4 ++--
java/code/src/com/redhat/rhn/frontend/strings/database/StringResource_ko.xml | 4 ++--
java/code/src/com/redhat/rhn/frontend/strings/database/StringResource_pa.xml | 4 ++--
java/code/src/com/redhat/rhn/frontend/strings/database/StringResource_pt_BR.xml | 4 ++--
java/code/src/com/redhat/rhn/frontend/strings/database/StringResource_ru.xml | 4 ++--
java/code/src/com/redhat/rhn/frontend/strings/database/StringResource_ta.xml | 4 ++--
java/code/src/com/redhat/rhn/frontend/strings/database/StringResource_zh_CN.xml | 4 ++--
java/code/src/com/redhat/rhn/frontend/strings/database/StringResource_zh_TW.xml | 4 ++--
16 files changed, 31 insertions(+), 31 deletions(-)
New commits:
commit 7da7cde1aa1ded66d76404336e57fd192d00d9b4
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Fri Nov 23 11:36:14 2012 +0100
798571 - Moscow time is GMT+4.
diff --git a/java/code/src/com/redhat/rhn/frontend/strings/database/StringResource_bn_IN.xml b/java/code/src/com/redhat/rhn/frontend/strings/database/StringResource_bn_IN.xml
index 56a45ae..9a2a16f 100644
--- a/java/code/src/com/redhat/rhn/frontend/strings/database/StringResource_bn_IN.xml
+++ b/java/code/src/com/redhat/rhn/frontend/strings/database/StringResource_bn_IN.xml
@@ -138,11 +138,11 @@
<target>(GMT+০৮০০) অস্ট্রেলিয়া (পশ্চিমাঞ্চল)</target>
</trans-unit>
<trans-unit id="Europe/Moscow">
- <source>(GMT+0300) Russia (Moscow)</source>
+ <source>(GMT+0400) Russia (Moscow)</source>
<context-group name="ctx">
<context context-type="sourcefile">/rhn/account/UserDetails</context>
</context-group>
- <target>(GMT+০৩০০) রাশিয়া (মস্কো)</target>
+ <target>(GMT+০৪০০) রাশিয়া (মস্কো)</target>
</trans-unit>
<trans-unit id="Europe/Bucharest">
<source>(GMT+0200) Europe (Eastern)</source>
diff --git a/java/code/src/com/redhat/rhn/frontend/strings/database/StringResource_de.xml b/java/code/src/com/redhat/rhn/frontend/strings/database/StringResource_de.xml
index 58e7ffe..4af64cd 100644
--- a/java/code/src/com/redhat/rhn/frontend/strings/database/StringResource_de.xml
+++ b/java/code/src/com/redhat/rhn/frontend/strings/database/StringResource_de.xml
@@ -138,11 +138,11 @@
<target>(GMT+0800) Australien (West)</target>
</trans-unit>
<trans-unit id="Europe/Moscow">
- <source>(GMT+0300) Russia (Moscow)</source>
+ <source>(GMT+0400) Russia (Moscow)</source>
<context-group name="ctx">
<context context-type="sourcefile">/rhn/account/UserDetails</context>
</context-group>
- <target>(GMT+0300) Russland (Moskau)</target>
+ <target>(GMT+0400) Russland (Moskau)</target>
</trans-unit>
<trans-unit id="Europe/Bucharest">
<source>(GMT+0200) Europe (Eastern)</source>
diff --git a/java/code/src/com/redhat/rhn/frontend/strings/database/StringResource_en_US.xml b/java/code/src/com/redhat/rhn/frontend/strings/database/StringResource_en_US.xml
index 500431b..6634516 100644
--- a/java/code/src/com/redhat/rhn/frontend/strings/database/StringResource_en_US.xml
+++ b/java/code/src/com/redhat/rhn/frontend/strings/database/StringResource_en_US.xml
@@ -117,7 +117,7 @@
</context-group>
</trans-unit>
<trans-unit id="Europe/Moscow">
- <source>(GMT+0300) Russia (Moscow)</source>
+ <source>(GMT+0400) Russia (Moscow)</source>
<context-group name="ctx">
<context context-type="sourcefile">/rhn/account/UserDetails</context>
</context-group>
diff --git a/java/code/src/com/redhat/rhn/frontend/strings/database/StringResource_es.xml b/java/code/src/com/redhat/rhn/frontend/strings/database/StringResource_es.xml
index 6cdcfc5..059d08a 100644
--- a/java/code/src/com/redhat/rhn/frontend/strings/database/StringResource_es.xml
+++ b/java/code/src/com/redhat/rhn/frontend/strings/database/StringResource_es.xml
@@ -138,11 +138,11 @@
<target>(GMT+0800) Australia (Occidental)</target>
</trans-unit>
<trans-unit id="Europe/Moscow">
- <source>(GMT+0300) Russia (Moscow)</source>
+ <source>(GMT+0400) Russia (Moscow)</source>
<context-group name="ctx">
<context context-type="sourcefile">/rhn/account/UserDetails</context>
</context-group>
- <target>(GMT+0300) Rusia (Moscú)</target>
+ <target>(GMT+0400) Rusia (Moscú)</target>
</trans-unit>
<trans-unit id="Europe/Bucharest">
<source>(GMT+0200) Europe (Eastern)</source>
diff --git a/java/code/src/com/redhat/rhn/frontend/strings/database/StringResource_fr.xml b/java/code/src/com/redhat/rhn/frontend/strings/database/StringResource_fr.xml
index 99d0031..069f339 100644
--- a/java/code/src/com/redhat/rhn/frontend/strings/database/StringResource_fr.xml
+++ b/java/code/src/com/redhat/rhn/frontend/strings/database/StringResource_fr.xml
@@ -138,11 +138,11 @@
<target>(GMT+0800) Australie (de l'ouest)</target>
</trans-unit>
<trans-unit id="Europe/Moscow">
- <source>(GMT+0300) Russia (Moscow)</source>
+ <source>(GMT+0400) Russia (Moscow)</source>
<context-group name="ctx">
<context context-type="sourcefile">/rhn/account/UserDetails</context>
</context-group>
- <target>(GMT+0300) Russie (Moscou)</target>
+ <target>(GMT+0400) Russie (Moscou)</target>
</trans-unit>
<trans-unit id="Europe/Bucharest">
<source>(GMT+0200) Europe (Eastern)</source>
diff --git a/java/code/src/com/redhat/rhn/frontend/strings/database/StringResource_gu.xml b/java/code/src/com/redhat/rhn/frontend/strings/database/StringResource_gu.xml
index ff856db..ac1ac45 100644
--- a/java/code/src/com/redhat/rhn/frontend/strings/database/StringResource_gu.xml
+++ b/java/code/src/com/redhat/rhn/frontend/strings/database/StringResource_gu.xml
@@ -138,11 +138,11 @@
<target>(GMT+0800) ઓસ્ટ્રેલિયા (પશ્ચિમી)</target>
</trans-unit>
<trans-unit id="Europe/Moscow">
- <source>(GMT+0300) Russia (Moscow)</source>
+ <source>(GMT+0400) Russia (Moscow)</source>
<context-group name="ctx">
<context context-type="sourcefile">/rhn/account/UserDetails</context>
</context-group>
- <target>(GMT+0300) રશિયા (મોસ્કો)</target>
+ <target>(GMT+0400) રશિયા (મોસ્કો)</target>
</trans-unit>
<trans-unit id="Europe/Bucharest">
<source>(GMT+0200) Europe (Eastern)</source>
diff --git a/java/code/src/com/redhat/rhn/frontend/strings/database/StringResource_hi.xml b/java/code/src/com/redhat/rhn/frontend/strings/database/StringResource_hi.xml
index fd5b4b6..71ccdd4 100644
--- a/java/code/src/com/redhat/rhn/frontend/strings/database/StringResource_hi.xml
+++ b/java/code/src/com/redhat/rhn/frontend/strings/database/StringResource_hi.xml
@@ -138,11 +138,11 @@
<target>(GMT+0800) ऑस्ट्रेलिया (पश्चिमी)</target>
</trans-unit>
<trans-unit id="Europe/Moscow">
- <source>(GMT+0300) Russia (Moscow)</source>
+ <source>(GMT+0400) Russia (Moscow)</source>
<context-group name="ctx">
<context context-type="sourcefile">/rhn/account/UserDetails</context>
</context-group>
- <target>(GMT+0300) रूस (मास्को)</target>
+ <target>(GMT+0400) रूस (मास्को)</target>
</trans-unit>
<trans-unit id="Europe/Bucharest">
<source>(GMT+0200) Europe (Eastern)</source>
diff --git a/java/code/src/com/redhat/rhn/frontend/strings/database/StringResource_it.xml b/java/code/src/com/redhat/rhn/frontend/strings/database/StringResource_it.xml
index cb5a425..7ff803a 100644
--- a/java/code/src/com/redhat/rhn/frontend/strings/database/StringResource_it.xml
+++ b/java/code/src/com/redhat/rhn/frontend/strings/database/StringResource_it.xml
@@ -138,11 +138,11 @@
<target>(GMT+0800) Australia (Occidentale)</target>
</trans-unit>
<trans-unit id="Europe/Moscow">
- <source>(GMT+0300) Russia (Moscow)</source>
+ <source>(GMT+0400) Russia (Moscow)</source>
<context-group name="ctx">
<context context-type="sourcefile">/rhn/account/UserDetails</context>
</context-group>
- <target>(GMT+0300) Russia (Mosca)</target>
+ <target>(GMT+0400) Russia (Mosca)</target>
</trans-unit>
<trans-unit id="Europe/Bucharest">
<source>(GMT+0200) Europe (Eastern)</source>
diff --git a/java/code/src/com/redhat/rhn/frontend/strings/database/StringResource_ja.xml b/java/code/src/com/redhat/rhn/frontend/strings/database/StringResource_ja.xml
index 943a74a..ce7f565 100644
--- a/java/code/src/com/redhat/rhn/frontend/strings/database/StringResource_ja.xml
+++ b/java/code/src/com/redhat/rhn/frontend/strings/database/StringResource_ja.xml
@@ -138,11 +138,11 @@
<target>(GMT+0800) オーストラリア (西部)</target>
</trans-unit>
<trans-unit id="Europe/Moscow">
- <source>(GMT+0300) Russia (Moscow)</source>
+ <source>(GMT+0400) Russia (Moscow)</source>
<context-group name="ctx">
<context context-type="sourcefile">/rhn/account/UserDetails</context>
</context-group>
- <target>(GMT+0300) ロシア (モスクワ)</target>
+ <target>(GMT+0400) ロシア (モスクワ)</target>
</trans-unit>
<trans-unit id="Europe/Bucharest">
<source>(GMT+0200) Europe (Eastern)</source>
diff --git a/java/code/src/com/redhat/rhn/frontend/strings/database/StringResource_ko.xml b/java/code/src/com/redhat/rhn/frontend/strings/database/StringResource_ko.xml
index 19d387f..a4ae46e 100644
--- a/java/code/src/com/redhat/rhn/frontend/strings/database/StringResource_ko.xml
+++ b/java/code/src/com/redhat/rhn/frontend/strings/database/StringResource_ko.xml
@@ -138,11 +138,11 @@
<target>(GMT+0800) 호주 (서부)</target>
</trans-unit>
<trans-unit id="Europe/Moscow">
- <source>(GMT+0300) Russia (Moscow)</source>
+ <source>(GMT+0400) Russia (Moscow)</source>
<context-group name="ctx">
<context context-type="sourcefile">/rhn/account/UserDetails</context>
</context-group>
- <target>(GMT+0300) 러시아 (모스크바)</target>
+ <target>(GMT+0400) 러시아 (모스크바)</target>
</trans-unit>
<trans-unit id="Europe/Bucharest">
<source>(GMT+0200) Europe (Eastern)</source>
diff --git a/java/code/src/com/redhat/rhn/frontend/strings/database/StringResource_pa.xml b/java/code/src/com/redhat/rhn/frontend/strings/database/StringResource_pa.xml
index 6747c06..8c94f0f 100644
--- a/java/code/src/com/redhat/rhn/frontend/strings/database/StringResource_pa.xml
+++ b/java/code/src/com/redhat/rhn/frontend/strings/database/StringResource_pa.xml
@@ -138,11 +138,11 @@
<target>(GMT+0800) ਆਸਟਰੇਲੀਆ (ਪੱਛਮੀ)</target>
</trans-unit>
<trans-unit id="Europe/Moscow">
- <source>(GMT+0300) Russia (Moscow)</source>
+ <source>(GMT+0400) Russia (Moscow)</source>
<context-group name="ctx">
<context context-type="sourcefile">/rhn/account/UserDetails</context>
</context-group>
- <target>(GMT+0300) ਰੂਸ (ਮਾਸਕੋ)</target>
+ <target>(GMT+0400) ਰੂਸ (ਮਾਸਕੋ)</target>
</trans-unit>
<trans-unit id="Europe/Bucharest">
<source>(GMT+0200) Europe (Eastern)</source>
diff --git a/java/code/src/com/redhat/rhn/frontend/strings/database/StringResource_pt_BR.xml b/java/code/src/com/redhat/rhn/frontend/strings/database/StringResource_pt_BR.xml
index 2a41f77..69c1949 100644
--- a/java/code/src/com/redhat/rhn/frontend/strings/database/StringResource_pt_BR.xml
+++ b/java/code/src/com/redhat/rhn/frontend/strings/database/StringResource_pt_BR.xml
@@ -138,11 +138,11 @@
<target>(GMT+0800) Austrália (Oeste)</target>
</trans-unit>
<trans-unit id="Europe/Moscow">
- <source>(GMT+0300) Russia (Moscow)</source>
+ <source>(GMT+0400) Russia (Moscow)</source>
<context-group name="ctx">
<context context-type="sourcefile">/rhn/account/UserDetails</context>
</context-group>
- <target>(GMT+0300) Rússia (Moscou)</target>
+ <target>(GMT+0400) Rússia (Moscou)</target>
</trans-unit>
<trans-unit id="Europe/Bucharest">
<source>(GMT+0200) Europe (Eastern)</source>
diff --git a/java/code/src/com/redhat/rhn/frontend/strings/database/StringResource_ru.xml b/java/code/src/com/redhat/rhn/frontend/strings/database/StringResource_ru.xml
index 17bb64f..9c9ef27 100644
--- a/java/code/src/com/redhat/rhn/frontend/strings/database/StringResource_ru.xml
+++ b/java/code/src/com/redhat/rhn/frontend/strings/database/StringResource_ru.xml
@@ -138,11 +138,11 @@
<target>(GMT+0800) Австралия (Западный часовой пояс)</target>
</trans-unit>
<trans-unit id="Europe/Moscow">
- <source>(GMT+0300) Russia (Moscow)</source>
+ <source>(GMT+0400) Russia (Moscow)</source>
<context-group name="ctx">
<context context-type="sourcefile">/rhn/account/UserDetails</context>
</context-group>
- <target>(GMT+0300) Россия (Москва)</target>
+ <target>(GMT+0400) Россия (Москва)</target>
</trans-unit>
<trans-unit id="Europe/Bucharest">
<source>(GMT+0200) Europe (Eastern)</source>
diff --git a/java/code/src/com/redhat/rhn/frontend/strings/database/StringResource_ta.xml b/java/code/src/com/redhat/rhn/frontend/strings/database/StringResource_ta.xml
index ff6d97f..3e2962f 100644
--- a/java/code/src/com/redhat/rhn/frontend/strings/database/StringResource_ta.xml
+++ b/java/code/src/com/redhat/rhn/frontend/strings/database/StringResource_ta.xml
@@ -138,11 +138,11 @@
<target>(GMT+0800) ஆஸ்திரேலியா (மேற்கு)</target>
</trans-unit>
<trans-unit id="Europe/Moscow">
- <source>(GMT+0300) Russia (Moscow)</source>
+ <source>(GMT+0400) Russia (Moscow)</source>
<context-group name="ctx">
<context context-type="sourcefile">/rhn/account/UserDetails</context>
</context-group>
- <target>(GMT+0300) ரஷ்யா (மாஸ்கோ)</target>
+ <target>(GMT+0400) ரஷ்யா (மாஸ்கோ)</target>
</trans-unit>
<trans-unit id="Europe/Bucharest">
<source>(GMT+0200) Europe (Eastern)</source>
diff --git a/java/code/src/com/redhat/rhn/frontend/strings/database/StringResource_zh_CN.xml b/java/code/src/com/redhat/rhn/frontend/strings/database/StringResource_zh_CN.xml
index 369b302..4f7da33 100644
--- a/java/code/src/com/redhat/rhn/frontend/strings/database/StringResource_zh_CN.xml
+++ b/java/code/src/com/redhat/rhn/frontend/strings/database/StringResource_zh_CN.xml
@@ -138,11 +138,11 @@
<target>（GMT+0800）澳大利亚（西部）</target>
</trans-unit>
<trans-unit id="Europe/Moscow">
- <source>(GMT+0300) Russia (Moscow)</source>
+ <source>(GMT+0400) Russia (Moscow)</source>
<context-group name="ctx">
<context context-type="sourcefile">/rhn/account/UserDetails</context>
</context-group>
- <target>（GMT+0300）俄罗斯（莫斯科）</target>
+ <target>（GMT+0400）俄罗斯（莫斯科）</target>
</trans-unit>
<trans-unit id="Europe/Bucharest">
<source>(GMT+0200) Europe (Eastern)</source>
diff --git a/java/code/src/com/redhat/rhn/frontend/strings/database/StringResource_zh_TW.xml b/java/code/src/com/redhat/rhn/frontend/strings/database/StringResource_zh_TW.xml
index ae12ea3..b1a93b5 100644
--- a/java/code/src/com/redhat/rhn/frontend/strings/database/StringResource_zh_TW.xml
+++ b/java/code/src/com/redhat/rhn/frontend/strings/database/StringResource_zh_TW.xml
@@ -138,11 +138,11 @@
<target>(GMT+0800) 澳大利亞 (西部時間)</target>
</trans-unit>
<trans-unit id="Europe/Moscow">
- <source>(GMT+0300) Russia (Moscow)</source>
+ <source>(GMT+0400) Russia (Moscow)</source>
<context-group name="ctx">
<context context-type="sourcefile">/rhn/account/UserDetails</context>
</context-group>
- <target>(GMT+0300) 俄羅斯 (莫斯科)</target>
+ <target>(GMT+0400) 俄羅斯 (莫斯科)</target>
</trans-unit>
<trans-unit id="Europe/Bucharest">
<source>(GMT+0200) Europe (Eastern)</source>
11 years, 5 months