spacewalk-commits October 2013

spacewalk-commits@lists.fedorahosted.org

11 participants
189 discussions

client/rhel rel-eng/packages
by Michael Mraka 04 Oct '13

04 Oct '13

client/rhel/rhnlib/rhnlib.spec | 5 ++++- rel-eng/packages/rhnlib | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) New commits: commit f4bfa00c110e8247248ba8cce5722fbf0566fe84 Author: Michael Mraka <michael.mraka(a)redhat.com> Date: Fri Oct 4 12:52:53 2013 +0200 Automatic commit of package [rhnlib] release [2.5.68-1]. diff --git a/client/rhel/rhnlib/rhnlib.spec b/client/rhel/rhnlib/rhnlib.spec index 0ee231d..9389ee6 100644 --- a/client/rhel/rhnlib/rhnlib.spec +++ b/client/rhel/rhnlib/rhnlib.spec @@ -4,7 +4,7 @@ Summary: Python libraries for the Spacewalk project Name: rhnlib URL: https://fedorahosted.org/spacewalk Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz -Version: 2.5.67 +Version: 2.5.68 Release: 1%{?dist} Group: Development/Libraries @@ -59,6 +59,9 @@ rm -rf $RPM_BUILD_ROOT %{python_sitelib}/* %changelog +* Fri Oct 04 2013 Michael Mraka <michael.mraka(a)redhat.com> 2.5.68-1 +- Python: fixed UserDictCase behaviour when key is not found + * Mon Sep 30 2013 Michael Mraka <michael.mraka(a)redhat.com> 2.5.67-1 - removed trailing whitespaces diff --git a/rel-eng/packages/rhnlib b/rel-eng/packages/rhnlib index a712de7..473a74f 100644 --- a/rel-eng/packages/rhnlib +++ b/rel-eng/packages/rhnlib @@ -1 +1 @@ -2.5.67-1 client/rhel/rhnlib/ +2.5.68-1 client/rhel/rhnlib/

1 0

Changes to 'refs/tags/spacewalk-backend-2.1.26-1'
by Michael Mraka 04 Oct '13

04 Oct '13

Tag 'spacewalk-backend-2.1.26-1' created by Michael Mraka <michael.mraka(a)redhat.com> at 2013-10-04 10:51 +0000 Tagging package [spacewalk-backend] version [2.1.26-1] in directory [backend/]. Changes since spacewalk-java-2.1.52-1: Flavio Castelli (6): Fixed script which runs python PostgreSQL tests Python db tests: moved connection settings to dedicated file Python pgsql driver: handled ProgrammingError exceptions Fixed errors inside of the python pgsql test suite. Python: fixed UserDictCase behaviour when key is not found Python pgsql db tests: fix broken test Michael Mraka (1): Automatic commit of package [spacewalk-backend] release [2.1.26-1]. Milan Zazrivec (1): fix typo in a comment Stephen Herr (2): 1006182 - Make ISS Master and Slave tabs less confusing 1006127 - Make Search button translatable --- backend/server/rhnSQL/driver_postgresql.py | 2 backend/spacewalk-backend.spec | 9 +++- backend/test/db_settings.ini | 5 ++ backend/test/non-unit/server/rhnSQL/dbtests.py | 7 ++- backend/test/runtests-postgresql.py | 21 ++++++---- client/rhel/rhnlib/rhn/UserDictCase.py | 2 java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_en_US.xml | 4 - java/code/webapp/WEB-INF/includes/header.jsp | 2 rel-eng/packages/spacewalk-backend | 2 spacecmd/src/lib/utils.py | 2 10 files changed, 38 insertions(+), 18 deletions(-) ---

1 0

7 commits - backend/server backend/spacewalk-backend.spec backend/test client/rhel rel-eng/packages
by Michael Mraka 04 Oct '13

04 Oct '13

backend/server/rhnSQL/driver_postgresql.py | 2 ++ backend/spacewalk-backend.spec | 9 ++++++++- backend/test/db_settings.ini | 5 +++++ backend/test/non-unit/server/rhnSQL/dbtests.py | 7 +++++-- backend/test/runtests-postgresql.py | 21 +++++++++++++-------- client/rhel/rhnlib/rhn/UserDictCase.py | 2 -- rel-eng/packages/spacewalk-backend | 2 +- 7 files changed, 34 insertions(+), 14 deletions(-) New commits: commit b78f797a86ce3dc62eee914aeece5550a4208ea7 Author: Michael Mraka <michael.mraka(a)redhat.com> Date: Fri Oct 4 12:51:41 2013 +0200 Automatic commit of package [spacewalk-backend] release [2.1.26-1]. diff --git a/backend/spacewalk-backend.spec b/backend/spacewalk-backend.spec index 5938859..30dbcba 100644 --- a/backend/spacewalk-backend.spec +++ b/backend/spacewalk-backend.spec @@ -11,7 +11,7 @@ Name: spacewalk-backend Summary: Common programs needed to be installed on the Spacewalk servers/proxies Group: Applications/Internet License: GPLv2 -Version: 2.1.25 +Version: 2.1.26 Release: 1%{?dist} URL: https://fedorahosted.org/spacewalk Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz @@ -628,6 +628,13 @@ rm -f %{rhnconf}/rhnSecret.py* # $Id$ %changelog +* Fri Oct 04 2013 Michael Mraka <michael.mraka(a)redhat.com> 2.1.26-1 +- Python pgsql db tests: fix broken test +- Fixed errors inside of the python pgsql test suite. +- Python pgsql driver: handled ProgrammingError exceptions +- Python db tests: moved connection settings to dedicated file +- Fixed script which runs python PostgreSQL tests + * Wed Oct 02 2013 Michael Mraka <michael.mraka(a)redhat.com> 2.1.25-1 - 923338 - replace application code with database lookup to prevent conflicting inserts diff --git a/rel-eng/packages/spacewalk-backend b/rel-eng/packages/spacewalk-backend index 7bfb0f0..766160c 100644 --- a/rel-eng/packages/spacewalk-backend +++ b/rel-eng/packages/spacewalk-backend @@ -1 +1 @@ -2.1.25-1 backend/ +2.1.26-1 backend/ commit a5d90e2dad95fcf69464504a2b21bd053cd8b263 Author: Flavio Castelli <fcastelli(a)suse.com> Date: Fri Oct 4 10:55:06 2013 +0200 Python pgsql db tests: fix broken test The psycopg2 library raises a `KeyError` when a some of the named parameters of a prepared statement are not given. diff --git a/backend/test/non-unit/server/rhnSQL/dbtests.py b/backend/test/non-unit/server/rhnSQL/dbtests.py index 32f722e..ff51148 100644 --- a/backend/test/non-unit/server/rhnSQL/dbtests.py +++ b/backend/test/non-unit/server/rhnSQL/dbtests.py @@ -66,7 +66,7 @@ class RhnSQLDatabaseTests(unittest.TestCase): query = "INSERT INTO %s(id, name) VALUES(:id, :name)" % \ self.temp_table cursor = rhnSQL.prepare(query) - self.assertRaises(sql_base.SQLError, cursor.execute, name="Blah") + self.assertRaises(KeyError, cursor.execute, name="Blah") def test_statement_prepare_error(self): rhnSQL.transaction("test_statement_prepare_error") commit 251005196b02b18afd9b1215e8b6c0cc78b5d4d8 Author: Flavio Castelli <fcastelli(a)suse.com> Date: Fri Oct 4 10:55:05 2013 +0200 Python: fixed UserDictCase behaviour when key is not found The `UserDictCase` class is a dictionary with case insensitive keys. Since it's inherited from `UserDict` it can be passed to method/functions expecting a "classic" python dictionary. Unfortunately `UserDictCase` behaved in a different way when the specified key was not found: rather than raising a `KeyError` exception it just returned `None`. That broke duck typing in some places where a `KeyError` was expected and it also hid errors in other parts of the code (because no exception was being raised). This commit ensures `UserDictCase` has the same behaviour of python's dictionary. The change could break some parts of the code which took this bug as a feature. The python unit tests under 'backend/test' and 'backend/satellite_tools' are still passing. diff --git a/client/rhel/rhnlib/rhn/UserDictCase.py b/client/rhel/rhnlib/rhn/UserDictCase.py index cb55674..c4b8dd6 100644 --- a/client/rhel/rhnlib/rhn/UserDictCase.py +++ b/client/rhel/rhnlib/rhn/UserDictCase.py @@ -41,8 +41,6 @@ class UserDictCase(UserDict): def __getitem__(self, key): key = self.__lower_string(key) - if not self.data.has_key(key): - return None return self.data[key] get = __getitem__ commit 3dc37f6101ff683cffe54959ff08095bcad87d11 Author: Flavio Castelli <fcastelli(a)suse.com> Date: Fri Oct 4 10:55:04 2013 +0200 Fixed errors inside of the python pgsql test suite. Wrapped the 'test_statement_prepare_error' test inside of a transaction, that leaves the database in a clean state after the `rhnSQL.SQLStatementPrepareError` exception is raised. diff --git a/backend/test/non-unit/server/rhnSQL/dbtests.py b/backend/test/non-unit/server/rhnSQL/dbtests.py index 1be2c77..32f722e 100644 --- a/backend/test/non-unit/server/rhnSQL/dbtests.py +++ b/backend/test/non-unit/server/rhnSQL/dbtests.py @@ -69,11 +69,14 @@ class RhnSQLDatabaseTests(unittest.TestCase): self.assertRaises(sql_base.SQLError, cursor.execute, name="Blah") def test_statement_prepare_error(self): + rhnSQL.transaction("test_statement_prepare_error") + query = "aaa bbb ccc" cursor = rhnSQL.prepare(query) self.assertRaises(rhnSQL.SQLStatementPrepareError, cursor.execute) - rhnSQL.rollback() + + rhnSQL.rollback("test_statement_prepare_error") def test_execute_bindbyname_extra_params_passed(self): query = "SELECT * FROM %s WHERE id = :id" % self.temp_table commit ae7c7733859b5db8e0a659fa5c9ee73764b7ae87 Author: Flavio Castelli <fcastelli(a)suse.com> Date: Fri Oct 4 10:55:03 2013 +0200 Python pgsql driver: handled ProgrammingError exceptions Handled psycopg2.ProgramminError exceptions inside of the python pgsql driver. Raise them as sql_base.SQLStatementPrepareError. This is commit fixes the 'test_statement_prepare_error' test. diff --git a/backend/server/rhnSQL/driver_postgresql.py b/backend/server/rhnSQL/driver_postgresql.py index d467dca..c284ca0 100644 --- a/backend/server/rhnSQL/driver_postgresql.py +++ b/backend/server/rhnSQL/driver_postgresql.py @@ -277,6 +277,8 @@ class Cursor(sql_base.Cursor): if m: error_code = int(m.group(1)) raise sql_base.SQLSchemaError(error_code, e.pgerror, e) + except psycopg2.ProgrammingError, e: + raise sql_base.SQLStatementPrepareError(self.dbh, e.pgerror, self.sql) return retval def _execute_(self, args, kwargs): commit f2e0d4ccb44cef5cc6c9807f145e20cd161ffc06 Author: Flavio Castelli <fcastelli(a)suse.com> Date: Fri Oct 4 10:55:02 2013 +0200 Python db tests: moved connection settings to dedicated file Moved PostgreSQL connection settings into a dedicated configuration file. This makes easier to use different connection parameters since it's no longer needed to change the python source code. diff --git a/backend/test/db_settings.ini b/backend/test/db_settings.ini new file mode 100644 index 0000000..10e417f --- /dev/null +++ b/backend/test/db_settings.ini @@ -0,0 +1,5 @@ +[postgresql] +host: localhost +user: dgoodwin +password: spacewalk +database: spacewalk diff --git a/backend/test/runtests-postgresql.py b/backend/test/runtests-postgresql.py index 427c2f7..0a10ec7 100755 --- a/backend/test/runtests-postgresql.py +++ b/backend/test/runtests-postgresql.py @@ -23,6 +23,7 @@ import os import sys import unittest +from ConfigParser import ConfigParser from spacewalk.server import rhnSQL # Import all test modules here: @@ -32,10 +33,13 @@ sys.path.insert( ) import dbtests -PG_HOST = "localhost" -PG_USER = "dgoodwin" -PG_PASSWORD = "spacewalk" -PG_DATABASE = "spacewalk" +config = ConfigParser() +config.read(os.path.dirname(os.path.abspath(__file__)) + "/db_settings.ini") + +PG_HOST = config.get('postgresql', 'host') +PG_USER = config.get('postgresql', 'user') +PG_PASSWORD= config.get('postgresql', 'password') +PG_DATABASE = config.get('postgresql', 'database') rhnSQL.initDB(backend="postgresql", host=PG_HOST, username=PG_USER, password=PG_PASSWORD, database=PG_DATABASE) commit ef5e6e585b003426e392dc34c11270df5d007363 Author: Flavio Castelli <fcastelli(a)suse.com> Date: Fri Oct 4 10:55:01 2013 +0200 Fixed script which runs python PostgreSQL tests The script which starts the python PostgreSQL tests was broken because it didn't find some required resources, plus it looked for files/directories which are no longer available. diff --git a/backend/test/runtests-postgresql.py b/backend/test/runtests-postgresql.py index 94426f6..427c2f7 100755 --- a/backend/test/runtests-postgresql.py +++ b/backend/test/runtests-postgresql.py @@ -19,16 +19,17 @@ Non-pure tests requiring connectivity to a PostgreSQL server configured below. """ +import os import sys import unittest -sys.path.insert(0, '../') -sys.path.insert(0, './suites/') -sys.path.insert(0, '../../client/rhel/rhnlib') - from spacewalk.server import rhnSQL # Import all test modules here: +sys.path.insert( + 0, + os.path.abspath(os.path.dirname(os.path.abspath(__file__) + "/../non-unit/server/rhnSQL/")) +) import dbtests PG_HOST = "localhost"

1 0

spacecmd/src
by Milan Zazrivec 04 Oct '13

04 Oct '13

spacecmd/src/lib/utils.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 133d65ab7292b600e0ec4df212d6ad6966149e82 Author: Milan Zazrivec <mzazrivec(a)redhat.com> Date: Fri Oct 4 11:39:03 2013 +0200 fix typo in a comment diff --git a/spacecmd/src/lib/utils.py b/spacecmd/src/lib/utils.py index 7fc85b9..453bdb1 100644 --- a/spacecmd/src/lib/utils.py +++ b/spacecmd/src/lib/utils.py @@ -226,7 +226,7 @@ def prompt_user(prompt, noblank = False, multiline = False): return userinput -# parse time input from the userand return xmlrpclib.DateTime +# parse time input from the user and return xmlrpclib.DateTime def parse_time_input(userinput = ''): timestamp = None

1 0

java/code
by StephenHerr 03 Oct '13

03 Oct '13

java/code/webapp/WEB-INF/includes/header.jsp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 3152dbb684688ed06bd6b958ab58e486d9cc8455 Author: Stephen Herr <sherr(a)redhat.com> Date: Thu Oct 3 15:03:44 2013 -0400 1006127 - Make Search button translatable diff --git a/java/code/webapp/WEB-INF/includes/header.jsp b/java/code/webapp/WEB-INF/includes/header.jsp index 8912101..c6aa967 100644 --- a/java/code/webapp/WEB-INF/includes/header.jsp +++ b/java/code/webapp/WEB-INF/includes/header.jsp @@ -59,7 +59,7 @@ <option value="docs"><bean:message key="header.jsp.documentation"/></option> </select><input type="text" name="search_string" maxlength="40" size="20" accesskey="4" autofocus="autofocus"/> <input type="hidden" name="submitted" value="true"/> - <input type="submit" class="button" name="image-1" value="Search" align="top" /></form> + <input type="submit" class="button" name="image-1" value="<bean:message key="button.search"/>" align="top" /></form> </div> </rhn:require>

1 0

java/code
by StephenHerr 03 Oct '13

03 Oct '13

java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_en_US.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) New commits: commit 07d1e597f1529456446f662007bbc0b537cca9c7 Author: Stephen Herr <sherr(a)redhat.com> Date: Thu Oct 3 14:30:07 2013 -0400 1006182 - Make ISS Master and Slave tabs less confusing diff --git a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_en_US.xml b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_en_US.xml index 85f5d7f..0a464b9 100644 --- a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_en_US.xml +++ b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_en_US.xml @@ -20374,7 +20374,7 @@ given channel.</source> <source>ISS Configuration - Master Setup</source> </trans-unit> <trans-unit id="iss.master.jsp.explanation"> - <source>Below are the slaves that are allowed to synchronize content from this @@PRODUCT_NAME@@ instance.</source> + <source>Below are the slaves that are allowed to synchronize content from this master @@PRODUCT_NAME@@ instance.</source> </trans-unit> <trans-unit id="iss.master.jsp.header2"> <source>Known Slave Instances</source> @@ -20428,7 +20428,7 @@ given channel.</source> <source>ISS Configuration - Slave Setup</source> </trans-unit> <trans-unit id="iss.slave.jsp.explanation"> - <source>Below are all the master @@PRODUCT_NAME@@ instances that this @@PRODUCT_NAME@@ instance has ever synchronized content from.</source> + <source>Below are all the master @@PRODUCT_NAME@@ instances that this slave @@PRODUCT_NAME@@ instance has ever synchronized content from.</source> </trans-unit> <trans-unit id="iss.slave.jsp.header2"> <source>Known Master Instances</source>

1 0

Changes to 'refs/tags/spacewalk-java-2.1.52-1'
by Michael Mraka 02 Oct '13

02 Oct '13

Tag 'spacewalk-java-2.1.52-1' created by Michael Mraka <michael.mraka(a)redhat.com> at 2013-10-02 13:59 +0000 Tagging package [spacewalk-java] version [2.1.52-1] in directory [java/]. Changes since spacewalk-search-2.1.3-1: Michael Mraka (1): Automatic commit of package [spacewalk-java] release [2.1.52-1]. --- java/spacewalk-java.spec | 7 ++++++- rel-eng/packages/spacewalk-java | 2 +- 2 files changed, 7 insertions(+), 2 deletions(-) ---

1 0

java/spacewalk-java.spec rel-eng/packages
by Michael Mraka 02 Oct '13

02 Oct '13

java/spacewalk-java.spec | 7 ++++++- rel-eng/packages/spacewalk-java | 2 +- 2 files changed, 7 insertions(+), 2 deletions(-) New commits: commit 27ec7e95b6eb91a4b45ee888fd83b501f216845e Author: Michael Mraka <michael.mraka(a)redhat.com> Date: Wed Oct 2 15:59:48 2013 +0200 Automatic commit of package [spacewalk-java] release [2.1.52-1]. diff --git a/java/spacewalk-java.spec b/java/spacewalk-java.spec index b685668..063aad4 100644 --- a/java/spacewalk-java.spec +++ b/java/spacewalk-java.spec @@ -28,7 +28,7 @@ Name: spacewalk-java Summary: Spacewalk Java site packages Group: Applications/Internet License: GPLv2 -Version: 2.1.51 +Version: 2.1.52 Release: 1%{?dist} URL: https://fedorahosted.org/spacewalk Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz @@ -785,6 +785,11 @@ fi %{jardir}/postgresql-jdbc.jar %changelog +* Wed Oct 02 2013 Michael Mraka <michael.mraka(a)redhat.com> 2.1.52-1 +- 1002590 - unified way how we call rhn-search cleanindex +- Serializers for Taskomatic: log serialization errors +- Added an Ivy dependency needed for tests + * Tue Oct 01 2013 Grant Gainey <ggainey(a)redhat.com> 2.1.51-1 - Refactoring that lets us log serialization errors * Added RhnXmlRpcCustomSerializer base class * Refactored all Serializers to extend diff --git a/rel-eng/packages/spacewalk-java b/rel-eng/packages/spacewalk-java index 53e4724..c84995b 100644 --- a/rel-eng/packages/spacewalk-java +++ b/rel-eng/packages/spacewalk-java @@ -1 +1 @@ -2.1.51-1 java/ +2.1.52-1 java/

1 0

Changes to 'refs/tags/spacewalk-search-2.1.3-1'
by Michael Mraka 02 Oct '13

02 Oct '13

Tag 'spacewalk-search-2.1.3-1' created by Michael Mraka <michael.mraka(a)redhat.com> at 2013-10-02 13:59 +0000 Tagging package [spacewalk-search] version [2.1.3-1] in directory [search-server/spacewalk-search/]. Changes since spacecmd-2.1.11-1: Michael Mraka (2): 1002590 - unified way how we call rhn-search cleanindex Automatic commit of package [spacewalk-search] release [2.1.3-1]. --- java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_bn_IN.xml | 6 +-- java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_de.xml | 12 +++--- java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_en_US.xml | 6 +-- java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_es.xml | 12 +++--- java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_fr.xml | 12 +++--- java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_gu.xml | 6 +-- java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_hi.xml | 6 +-- java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_it.xml | 12 +++--- java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_ja.xml | 12 +++--- java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_ko.xml | 12 +++--- java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_pa.xml | 6 +-- java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_pt_BR.xml | 12 +++--- java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_ru.xml | 12 +++--- java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_ta.xml | 6 +-- java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_zh_CN.xml | 12 +++--- java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_zh_TW.xml | 12 +++--- rel-eng/packages/spacewalk-search | 2 - search-server/spacewalk-search/spacewalk-search.spec | 13 ++++-- search-server/spacewalk-search/src/config/rhn-search.init | 20 ++++++++++ 19 files changed, 107 insertions(+), 84 deletions(-) ---

1 0

2 commits - java/code rel-eng/packages search-server/spacewalk-search
by Michael Mraka 02 Oct '13

02 Oct '13

java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_bn_IN.xml | 6 +-- java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_de.xml | 12 +++--- java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_en_US.xml | 6 +-- java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_es.xml | 12 +++--- java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_fr.xml | 12 +++--- java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_gu.xml | 6 +-- java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_hi.xml | 6 +-- java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_it.xml | 12 +++--- java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_ja.xml | 12 +++--- java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_ko.xml | 12 +++--- java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_pa.xml | 6 +-- java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_pt_BR.xml | 12 +++--- java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_ru.xml | 12 +++--- java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_ta.xml | 6 +-- java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_zh_CN.xml | 12 +++--- java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_zh_TW.xml | 12 +++--- rel-eng/packages/spacewalk-search | 2 - search-server/spacewalk-search/spacewalk-search.spec | 13 ++++-- search-server/spacewalk-search/src/config/rhn-search.init | 20 ++++++++++ 19 files changed, 107 insertions(+), 84 deletions(-) New commits: commit fbcb642c42eb7175e74e406dcc30a9f92f350e99 Author: Michael Mraka <michael.mraka(a)redhat.com> Date: Wed Oct 2 15:59:12 2013 +0200 Automatic commit of package [spacewalk-search] release [2.1.3-1]. diff --git a/rel-eng/packages/spacewalk-search b/rel-eng/packages/spacewalk-search index 4fd027d..a4dd053 100644 --- a/rel-eng/packages/spacewalk-search +++ b/rel-eng/packages/spacewalk-search @@ -1 +1 @@ -2.1.2-1 search-server/spacewalk-search/ +2.1.3-1 search-server/spacewalk-search/ diff --git a/search-server/spacewalk-search/spacewalk-search.spec b/search-server/spacewalk-search/spacewalk-search.spec index 32c3e8c..03ca9f7 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: 2.1.2 +Version: 2.1.3 Release: 1%{?dist} # This src.rpm is cannonical upstream # You can obtain it using this set of commands @@ -182,6 +182,9 @@ fi %attr(755, root, root) %{_var}/lib/rhn/search/indexes/docs %changelog +* Wed Oct 02 2013 Michael Mraka <michael.mraka(a)redhat.com> 2.1.3-1 +- 1002590 - unified way how we call rhn-search cleanindex + * Tue Oct 01 2013 Michael Mraka <michael.mraka(a)redhat.com> 2.1.2-1 - 1013629 - clean up old help links commit 4c3e294e7883df195c20b7ee9d5b5818e9c06c3d Author: Michael Mraka <michael.mraka(a)redhat.com> Date: Wed Oct 2 14:45:05 2013 +0200 1002590 - unified way how we call rhn-search cleanindex It's been 'service rhn-search cleanindex' on SystemV and '/usr/sbin/rhn-search cleanindex' on systemd. Unified both SystemV and systemd init scripts to be just wrappers which call /usr/sbin/rhn-search. diff --git a/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_bn_IN.xml b/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_bn_IN.xml index 39fca95..4b0ed00 100644 --- a/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_bn_IN.xml +++ b/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_bn_IN.xml @@ -2794,14 +2794,14 @@ available for this kickstart profile to function properly. <target>কোয়েরি '{0}' পার্স করা যায়নি।</target> </trans-unit> <trans-unit id="packages.search.index_files_missing"> - <source>Index files missing from search-server. Assuming data exists in database, indexes can be regenerated by running: service rhn-search cleanindex, then restart rhn-search</source> + <source>Index files missing from search-server. Assuming data exists in database, indexes can be regenerated by running: /usr/sbin/rhn-search cleanindex, then restart rhn-search</source> <context-group name="ctx"> <context context-type="sourcefile">/rhn/channels/Search</context> <context context-type="sourcefile">/rhn/systems/Search</context> <context context-type="sourcefile">/rhn/help/Search</context> <context context-type="sourcefile">/rhn/errata/Search</context> </context-group> - <target>অনুসন্ধানের সার্ভারে ইন্ডেক্স ফাইল অনুপস্থিত। ডাটাবেসের মধ্যে তথ্য অনুপস্থিত থাকলে, service rhn-search cleanindex কমান্ড প্রয়োগ করে ইন্ডেক্স পুনরায় নির্মাণ করে rhn-search পুনরায় আরম্ভ করুন</target> + <target>অনুসন্ধানের সার্ভারে ইন্ডেক্স ফাইল অনুপস্থিত। ডাটাবেসের মধ্যে তথ্য অনুপস্থিত থাকলে, /usr/sbin/rhn-search cleanindex কমান্ড প্রয়োগ করে ইন্ডেক্স পুনরায় নির্মাণ করে rhn-search পুনরায় আরম্ভ করুন</target> </trans-unit> <trans-unit id="packages.search.could_not_execute_query"> <source>Could not execute query '{0}'.</source> @@ -2814,7 +2814,7 @@ available for this kickstart profile to function properly. <target>কোয়েরি '{0}' সঞ্চালন করা যায়নি।</target> </trans-unit> <trans-unit id="searchserver.index_out_of_sync_with_db"> - <source>SearchServer index and database entries appear to be out of sync. Please run 'service rhn-search cleanindex'</source> + <source>SearchServer index and database entries appear to be out of sync. Please run '/usr/sbin/rhn-search cleanindex'</source> <context-group name="ctx"> <context context-type="sourcefile">/rhn/channels/Search</context> </context-group> diff --git a/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_de.xml b/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_de.xml index 0f7973a..6744577 100644 --- a/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_de.xml +++ b/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_de.xml @@ -2949,24 +2949,24 @@ verfügbar machen, damit dieses Kickstart-Profil einwandfrei funktionieren kann. <target>Konnte Anfrage '{0}' nicht analysieren.</target> </trans-unit> <trans-unit id="packages.search.index_files_missing"> - <source>Index files missing from search-server. Assuming data exists in database, indexes can be regenerated by running: service rhn-search cleanindex, then restart rhn-search</source> + <source>Index files missing from search-server. Assuming data exists in database, indexes can be regenerated by running: /usr/sbin/rhn-search cleanindex, then restart rhn-search</source> <context-group name="ctx"> <context context-type="sourcefile">/rhn/channels/Search</context> <context context-type="sourcefile">/rhn/systems/Search</context> <context context-type="sourcefile">/rhn/help/Search</context> <context context-type="sourcefile">/rhn/errata/Search</context> </context-group> - <target>Index-Dateien fehlen auf dem Such-Server. Vorausgesetzt, Daten existieren in der Datenbank, können Indizes wiederhergestellt werden durch Ausführen von: service rhn-search cleanindex, und anschließendem Neustart von rhn-search.</target> + <target>Index-Dateien fehlen auf dem Such-Server. Vorausgesetzt, Daten existieren in der Datenbank, können Indizes wiederhergestellt werden durch Ausführen von: /usr/sbin/rhn-search cleanindex, und anschließendem Neustart von rhn-search.</target> </trans-unit> <trans-unit id="packages.search.index_files_missing_for_docs"> - <source>Index files were missing from search-server for your locale. The search operation was performed using the default locale. Assuming data exists in database for your locale, indexes can be regenerated by running: service rhn-search cleanindex, then restart rhn-search</source> + <source>Index files were missing from search-server for your locale. The search operation was performed using the default locale. Assuming data exists in database for your locale, indexes can be regenerated by running: /usr/sbin/rhn-search cleanindex, then restart rhn-search</source> <context-group name="ctx"> <context context-type="sourcefile">/rhn/channels/Search</context> <context context-type="sourcefile">/rhn/systems/Search</context> <context context-type="sourcefile">/rhn/help/Search</context> <context context-type="sourcefile">/rhn/errata/Search</context> </context-group> - <target>Index-Dateien fehlten auf dem Such-Server für Ihr Gebietsschema. Die Suchoperation wurde unter Verwendung des standardmäßigen Gebietsschemas durchgeführt. Vorausgesetzt, Daten für Ihr Gebietsschema existieren in der Datenbank, können Indizes wiederhergestellt werden durch Ausführen von service rhn-search cleanindex, und anschließendem Neustart von rhn-search.</target> + <target>Index-Dateien fehlten auf dem Such-Server für Ihr Gebietsschema. Die Suchoperation wurde unter Verwendung des standardmäßigen Gebietsschemas durchgeführt. Vorausgesetzt, Daten für Ihr Gebietsschema existieren in der Datenbank, können Indizes wiederhergestellt werden durch Ausführen von /usr/sbin/rhn-search cleanindex, und anschließendem Neustart von rhn-search.</target> </trans-unit> <trans-unit id="packages.search.could_not_execute_query"> <source>Could not execute query '{0}'.</source> @@ -2979,11 +2979,11 @@ verfügbar machen, damit dieses Kickstart-Profil einwandfrei funktionieren kann. <target>Konnte Anfrage '{0}' nicht ausführen.</target> </trans-unit> <trans-unit id="searchserver.index_out_of_sync_with_db"> - <source>SearchServer index and database entries appear to be out of sync. Please run 'service rhn-search cleanindex'</source> + <source>SearchServer index and database entries appear to be out of sync. Please run '/usr/sbin/rhn-search cleanindex'</source> <context-group name="ctx"> <context context-type="sourcefile">/rhn/channels/Search</context> </context-group> - <target>SearchServer Index und Datenbankeinträge scheinen nicht übereinzustimmen. Bitte führen Sie 'service rhn-search cleanindex' aus.</target> + <target>SearchServer Index und Datenbankeinträge scheinen nicht übereinzustimmen. Bitte führen Sie '/usr/sbin/rhn-search cleanindex' aus.</target> </trans-unit> <trans-unit id="patches.installed.notavailable"> <source>Not Available</source> diff --git a/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_en_US.xml b/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_en_US.xml index de21eb1..b7c7f17 100644 --- a/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_en_US.xml +++ b/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_en_US.xml @@ -2519,7 +2519,7 @@ available for this kickstart profile to function properly. </context-group> </trans-unit> <trans-unit id="packages.search.index_files_missing"> - <source>Index files missing from search-server. Assuming data exists in database, indexes can be regenerated by running: service rhn-search cleanindex, then restart rhn-search</source> + <source>Index files missing from search-server. Assuming data exists in database, indexes can be regenerated by running: /usr/sbin/rhn-search cleanindex, then restart rhn-search</source> <context-group name="ctx"> <context context-type="sourcefile">/rhn/channels/Search</context> <context context-type="sourcefile">/rhn/systems/Search</context> @@ -2528,7 +2528,7 @@ available for this kickstart profile to function properly. </context-group> </trans-unit> <trans-unit id="packages.search.index_files_missing_for_docs"> - <source>Index files were missing from search-server for your locale. The search operation was performed using the default locale. Assuming data exists in database for your locale, indexes can be regenerated by running: service rhn-search cleanindex, then restart rhn-search</source> + <source>Index files were missing from search-server for your locale. The search operation was performed using the default locale. Assuming data exists in database for your locale, indexes can be regenerated by running: /usr/sbin/rhn-search cleanindex, then restart rhn-search</source> <context-group name="ctx"> <context context-type="sourcefile">/rhn/channels/Search</context> <context context-type="sourcefile">/rhn/systems/Search</context> @@ -2546,7 +2546,7 @@ available for this kickstart profile to function properly. </context-group> </trans-unit> <trans-unit id="searchserver.index_out_of_sync_with_db"> - <source>SearchServer index and database entries appear to be out of sync. Please run 'service rhn-search cleanindex'</source> + <source>SearchServer index and database entries appear to be out of sync. Please run '/usr/sbin/rhn-search cleanindex'</source> <context-group name="ctx"> <context context-type="sourcefile">/rhn/channels/Search</context> </context-group> diff --git a/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_es.xml b/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_es.xml index 5cd62e1..3746877 100644 --- a/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_es.xml +++ b/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_es.xml @@ -2949,24 +2949,24 @@ asegurarse de que estén disponibles para que este perfil kickstart funcione apr <target>No se pudo analizar la solicitud '{0}'.</target> </trans-unit> <trans-unit id="packages.search.index_files_missing"> - <source>Index files missing from search-server. Assuming data exists in database, indexes can be regenerated by running: service rhn-search cleanindex, then restart rhn-search</source> + <source>Index files missing from search-server. Assuming data exists in database, indexes can be regenerated by running: /usr/sbin/rhn-search cleanindex, then restart rhn-search</source> <context-group name="ctx"> <context context-type="sourcefile">/rhn/channels/Search</context> <context context-type="sourcefile">/rhn/systems/Search</context> <context context-type="sourcefile">/rhn/help/Search</context> <context context-type="sourcefile">/rhn/errata/Search</context> </context-group> - <target>Los archivos de índice faltan en el servidor de búsqueda. Asumiendo que existen datos en la base de datos, ejecute: service rhn-search cleanindex, para regenerar los índices y luego reinicie rhn-search</target> + <target>Los archivos de índice faltan en el servidor de búsqueda. Asumiendo que existen datos en la base de datos, ejecute: /usr/sbin/rhn-search cleanindex, para regenerar los índices y luego reinicie rhn-search</target> </trans-unit> <trans-unit id="packages.search.index_files_missing_for_docs"> - <source>Index files were missing from search-server for your locale. The search operation was performed using the default locale. Assuming data exists in database for your locale, indexes can be regenerated by running: service rhn-search cleanindex, then restart rhn-search</source> + <source>Index files were missing from search-server for your locale. The search operation was performed using the default locale. Assuming data exists in database for your locale, indexes can be regenerated by running: /usr/sbin/rhn-search cleanindex, then restart rhn-search</source> <context-group name="ctx"> <context context-type="sourcefile">/rhn/channels/Search</context> <context context-type="sourcefile">/rhn/systems/Search</context> <context context-type="sourcefile">/rhn/help/Search</context> <context context-type="sourcefile">/rhn/errata/Search</context> </context-group> - <target>Los archivos de índice faltaban en el servidor de búsqueda. La búsqueda se hizo con la región predeterminada. Asumiendo que existen datos en la base de datos para su región, ejecute: service rhn-search cleanindex, para regenerar los índices, y luego reinicie rhn-search.</target> + <target>Los archivos de índice faltaban en el servidor de búsqueda. La búsqueda se hizo con la región predeterminada. Asumiendo que existen datos en la base de datos para su región, ejecute: /usr/sbin/rhn-search cleanindex, para regenerar los índices, y luego reinicie rhn-search.</target> </trans-unit> <trans-unit id="packages.search.could_not_execute_query"> <source>Could not execute query '{0}'.</source> @@ -2979,11 +2979,11 @@ asegurarse de que estén disponibles para que este perfil kickstart funcione apr <target>No se pudo ejecutar la solicitud '{0}'.</target> </trans-unit> <trans-unit id="searchserver.index_out_of_sync_with_db"> - <source>SearchServer index and database entries appear to be out of sync. Please run 'service rhn-search cleanindex'</source> + <source>SearchServer index and database entries appear to be out of sync. Please run '/usr/sbin/rhn-search cleanindex'</source> <context-group name="ctx"> <context context-type="sourcefile">/rhn/channels/Search</context> </context-group> - <target>El índice SearchServer y las entradas de la base de datos no parecen estar sincronizados. Por favor ejecute 'service rhn-search cleanindex'</target> + <target>El índice SearchServer y las entradas de la base de datos no parecen estar sincronizados. Por favor ejecute '/usr/sbin/rhn-search cleanindex'</target> </trans-unit> <trans-unit id="patches.installed.notavailable"> <source>Not Available</source> diff --git a/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_fr.xml b/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_fr.xml index a742d1c..457e089 100644 --- a/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_fr.xml +++ b/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_fr.xml @@ -2951,24 +2951,24 @@ disponibles pour que ce profil kickstart puisse fonctionner correctement. <target>Impossible d'analyser la requête "{0}".</target> </trans-unit> <trans-unit id="packages.search.index_files_missing"> - <source>Index files missing from search-server. Assuming data exists in database, indexes can be regenerated by running: service rhn-search cleanindex, then restart rhn-search</source> + <source>Index files missing from search-server. Assuming data exists in database, indexes can be regenerated by running: /usr/sbin/rhn-search cleanindex, then restart rhn-search</source> <context-group name="ctx"> <context context-type="sourcefile">/rhn/channels/Search</context> <context context-type="sourcefile">/rhn/systems/Search</context> <context context-type="sourcefile">/rhn/help/Search</context> <context context-type="sourcefile">/rhn/errata/Search</context> </context-group> - <target>Fichiers d'index manquants du serveur de recherche. En supposant que les données existent dans la bas de données, les index peuvent être régénérés en exécutant : service rhn-search cleanindex, puis redémarrez rhn-search</target> + <target>Fichiers d'index manquants du serveur de recherche. En supposant que les données existent dans la bas de données, les index peuvent être régénérés en exécutant : /usr/sbin/rhn-search cleanindex, puis redémarrez rhn-search</target> </trans-unit> <trans-unit id="packages.search.index_files_missing_for_docs"> - <source>Index files were missing from search-server for your locale. The search operation was performed using the default locale. Assuming data exists in database for your locale, indexes can be regenerated by running: service rhn-search cleanindex, then restart rhn-search</source> + <source>Index files were missing from search-server for your locale. The search operation was performed using the default locale. Assuming data exists in database for your locale, indexes can be regenerated by running: /usr/sbin/rhn-search cleanindex, then restart rhn-search</source> <context-group name="ctx"> <context context-type="sourcefile">/rhn/channels/Search</context> <context context-type="sourcefile">/rhn/systems/Search</context> <context context-type="sourcefile">/rhn/help/Search</context> <context context-type="sourcefile">/rhn/errata/Search</context> </context-group> - <target>Des fichiers d'index sont manquants dans le serveur de recherche de vos paramètres régionaux. L'opération de recherche a été effectuée à l'aide des paramètres régionaux par défaut. Si des données existent dans la base de données de vos paramètres régionaux, les index peuvent être générés à nouveau en exécutant : service rhn-search cleanindex, puis redémarrez rhn-search</target> + <target>Des fichiers d'index sont manquants dans le serveur de recherche de vos paramètres régionaux. L'opération de recherche a été effectuée à l'aide des paramètres régionaux par défaut. Si des données existent dans la base de données de vos paramètres régionaux, les index peuvent être générés à nouveau en exécutant : /usr/sbin/rhn-search cleanindex, puis redémarrez rhn-search</target> </trans-unit> <trans-unit id="packages.search.could_not_execute_query"> <source>Could not execute query '{0}'.</source> @@ -2981,11 +2981,11 @@ disponibles pour que ce profil kickstart puisse fonctionner correctement. <target>Impossible d'analyser la requête « {0} ».</target> </trans-unit> <trans-unit id="searchserver.index_out_of_sync_with_db"> - <source>SearchServer index and database entries appear to be out of sync. Please run 'service rhn-search cleanindex'</source> + <source>SearchServer index and database entries appear to be out of sync. Please run '/usr/sbin/rhn-search cleanindex'</source> <context-group name="ctx"> <context context-type="sourcefile">/rhn/channels/Search</context> </context-group> - <target>Les entrées de la base de données et de l'index SearchServer ne sont pas synchronisées. Veuillez exécuter « service rhn-search cleanindex »</target> + <target>Les entrées de la base de données et de l'index SearchServer ne sont pas synchronisées. Veuillez exécuter « /usr/sbin/rhn-search cleanindex »</target> </trans-unit> <trans-unit id="patches.installed.notavailable"> <source>Not Available</source> diff --git a/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_gu.xml b/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_gu.xml index 6fc087c..caf2deb 100644 --- a/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_gu.xml +++ b/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_gu.xml @@ -2787,14 +2787,14 @@ available for this kickstart profile to function properly. <target>પ્રશ્ન '{0}' નું પદચ્છેદન કરી શક્યા નહિં.</target> </trans-unit> <trans-unit id="packages.search.index_files_missing"> - <source>Index files missing from search-server. Assuming data exists in database, indexes can be regenerated by running: service rhn-search cleanindex, then restart rhn-search</source> + <source>Index files missing from search-server. Assuming data exists in database, indexes can be regenerated by running: /usr/sbin/rhn-search cleanindex, then restart rhn-search</source> <context-group name="ctx"> <context context-type="sourcefile">/rhn/channels/Search</context> <context context-type="sourcefile">/rhn/systems/Search</context> <context context-type="sourcefile">/rhn/help/Search</context> <context context-type="sourcefile">/rhn/errata/Search</context> </context-group> - <target>સૂચક ફાઇલો શોધ-સર્વર માંથી ગુમ થયેલ છે. માહિતી એ ડેટાબેઝમાં હાજર છે તેવુ ધારી રહ્યા છે, અનુક્રમણિકાઓ ચલાવવા દ્દારા પુન:ઉત્પન્ન થઇ શકે છે: service rhn-search cleanindex, પછી rhn-search ને પુન:શરૂ કરો</target> + <target>સૂચક ફાઇલો શોધ-સર્વર માંથી ગુમ થયેલ છે. માહિતી એ ડેટાબેઝમાં હાજર છે તેવુ ધારી રહ્યા છે, અનુક્રમણિકાઓ ચલાવવા દ્દારા પુન:ઉત્પન્ન થઇ શકે છે: /usr/sbin/rhn-search cleanindex, પછી rhn-search ને પુન:શરૂ કરો</target> </trans-unit> <trans-unit id="packages.search.could_not_execute_query"> <source>Could not execute query '{0}'.</source> @@ -2807,7 +2807,7 @@ available for this kickstart profile to function properly. <target>પ્રશ્ન '{0}' ને ચલાવી શક્યા નહિં.</target> </trans-unit> <trans-unit id="searchserver.index_out_of_sync_with_db"> - <source>SearchServer index and database entries appear to be out of sync. Please run 'service rhn-search cleanindex'</source> + <source>SearchServer index and database entries appear to be out of sync. Please run '/usr/sbin/rhn-search cleanindex'</source> <context-group name="ctx"> <context context-type="sourcefile">/rhn/channels/Search</context> </context-group> diff --git a/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_hi.xml b/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_hi.xml index 15e4689..5cc0623 100644 --- a/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_hi.xml +++ b/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_hi.xml @@ -2787,14 +2787,14 @@ available for this kickstart profile to function properly. <target>{0} प्रश्न का विश्लेषण नहीं कर सका.</target> </trans-unit> <trans-unit id="packages.search.index_files_missing"> - <source>Index files missing from search-server. Assuming data exists in database, indexes can be regenerated by running: service rhn-search cleanindex, then restart rhn-search</source> + <source>Index files missing from search-server. Assuming data exists in database, indexes can be regenerated by running: /usr/sbin/rhn-search cleanindex, then restart rhn-search</source> <context-group name="ctx"> <context context-type="sourcefile">/rhn/channels/Search</context> <context context-type="sourcefile">/rhn/systems/Search</context> <context context-type="sourcefile">/rhn/help/Search</context> <context context-type="sourcefile">/rhn/errata/Search</context> </context-group> - <target>सूची फाइल खोज सर्वर में अनुपस्थित है. यह मानते हुए कि डेटा डेटाबेस में मौजूद है, सूची को इसे चलाते हुए फिर उत्पन्न किया जा सकता है: service rhn-search cleanindex, then restart rhn-search</target> + <target>सूची फाइल खोज सर्वर में अनुपस्थित है. यह मानते हुए कि डेटा डेटाबेस में मौजूद है, सूची को इसे चलाते हुए फिर उत्पन्न किया जा सकता है: /usr/sbin/rhn-search cleanindex, then restart rhn-search</target> </trans-unit> <trans-unit id="packages.search.could_not_execute_query"> <source>Could not execute query '{0}'.</source> @@ -2807,7 +2807,7 @@ available for this kickstart profile to function properly. <target>'{0}' प्रश्न का निस्पादन नहीं कर सका.</target> </trans-unit> <trans-unit id="searchserver.index_out_of_sync_with_db"> - <source>SearchServer index and database entries appear to be out of sync. Please run 'service rhn-search cleanindex'</source> + <source>SearchServer index and database entries appear to be out of sync. Please run '/usr/sbin/rhn-search cleanindex'</source> <context-group name="ctx"> <context context-type="sourcefile">/rhn/channels/Search</context> </context-group> diff --git a/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_it.xml b/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_it.xml index 04c4c5f..9e9df84 100644 --- a/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_it.xml +++ b/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_it.xml @@ -2948,24 +2948,24 @@ disponibili per un corretto funzionamento di questo profilo kickstart. <target>Impossibile analizzare l'interrogazione '{0}'.</target> </trans-unit> <trans-unit id="packages.search.index_files_missing"> - <source>Index files missing from search-server. Assuming data exists in database, indexes can be regenerated by running: service rhn-search cleanindex, then restart rhn-search</source> + <source>Index files missing from search-server. Assuming data exists in database, indexes can be regenerated by running: /usr/sbin/rhn-search cleanindex, then restart rhn-search</source> <context-group name="ctx"> <context context-type="sourcefile">/rhn/channels/Search</context> <context context-type="sourcefile">/rhn/systems/Search</context> <context context-type="sourcefile">/rhn/help/Search</context> <context context-type="sourcefile">/rhn/errata/Search</context> </context-group> - <target>File index mancanti dal search-server. Si assume la presenza dei dati nel database, è possibile rigenerare gli indici eseguendo: service rhn-search cleanindex, e successivamente riavviare rhn-search</target> + <target>File index mancanti dal search-server. Si assume la presenza dei dati nel database, è possibile rigenerare gli indici eseguendo: /usr/sbin/rhn-search cleanindex, e successivamente riavviare rhn-search</target> </trans-unit> <trans-unit id="packages.search.index_files_missing_for_docs"> - <source>Index files were missing from search-server for your locale. The search operation was performed using the default locale. Assuming data exists in database for your locale, indexes can be regenerated by running: service rhn-search cleanindex, then restart rhn-search</source> + <source>Index files were missing from search-server for your locale. The search operation was performed using the default locale. Assuming data exists in database for your locale, indexes can be regenerated by running: /usr/sbin/rhn-search cleanindex, then restart rhn-search</source> <context-group name="ctx"> <context context-type="sourcefile">/rhn/channels/Search</context> <context context-type="sourcefile">/rhn/systems/Search</context> <context context-type="sourcefile">/rhn/help/Search</context> <context context-type="sourcefile">/rhn/errata/Search</context> </context-group> - <target>File index mancanti dal server di ricerca per il tuo locale. Questa operazione di ricerca è stata eseguita usando il locale predefinito. Si assume la presenza dei dati nel database per il tuo locale, è possibile rigenerare gli indici eseguendo: service rhn-search cleanindex, e successivamente riavviare rhn-search</target> + <target>File index mancanti dal server di ricerca per il tuo locale. Questa operazione di ricerca è stata eseguita usando il locale predefinito. Si assume la presenza dei dati nel database per il tuo locale, è possibile rigenerare gli indici eseguendo: /usr/sbin/rhn-search cleanindex, e successivamente riavviare rhn-search</target> </trans-unit> <trans-unit id="packages.search.could_not_execute_query"> <source>Could not execute query '{0}'.</source> @@ -2978,11 +2978,11 @@ disponibili per un corretto funzionamento di questo profilo kickstart. <target>Impossibile eseguire l'interrogazione '{0}'.</target> </trans-unit> <trans-unit id="searchserver.index_out_of_sync_with_db"> - <source>SearchServer index and database entries appear to be out of sync. Please run 'service rhn-search cleanindex'</source> + <source>SearchServer index and database entries appear to be out of sync. Please run '/usr/sbin/rhn-search cleanindex'</source> <context-group name="ctx"> <context context-type="sourcefile">/rhn/channels/Search</context> </context-group> - <target>L'indice di SearchServer e le voci del database non sono sincronizzate. Eseguire 'service rhn-search cleanindex'</target> + <target>L'indice di SearchServer e le voci del database non sono sincronizzate. Eseguire '/usr/sbin/rhn-search cleanindex'</target> </trans-unit> <trans-unit id="patches.installed.notavailable"> <source>Not Available</source> diff --git a/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_ja.xml b/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_ja.xml index 9addf59..7c969af 100644 --- a/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_ja.xml +++ b/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_ja.xml @@ -2949,24 +2949,24 @@ rhn-kickstart* パッケージが利用可能であることを確認します <target>クエリを構文解析できませんでした '{0}'</target> </trans-unit> <trans-unit id="packages.search.index_files_missing"> - <source>Index files missing from search-server. Assuming data exists in database, indexes can be regenerated by running: service rhn-search cleanindex, then restart rhn-search</source> + <source>Index files missing from search-server. Assuming data exists in database, indexes can be regenerated by running: /usr/sbin/rhn-search cleanindex, then restart rhn-search</source> <context-group name="ctx"> <context context-type="sourcefile">/rhn/channels/Search</context> <context context-type="sourcefile">/rhn/systems/Search</context> <context context-type="sourcefile">/rhn/help/Search</context> <context context-type="sourcefile">/rhn/errata/Search</context> </context-group> - <target>検索サーバーにインデックスファイルがありません。データベースにデータが存在する場合、service rhn-search cleanindex を実行した後に rhn-search を再起動するとインデックスを再生成できます。</target> + <target>検索サーバーにインデックスファイルがありません。データベースにデータが存在する場合、/usr/sbin/rhn-search cleanindex を実行した後に rhn-search を再起動するとインデックスを再生成できます。</target> </trans-unit> <trans-unit id="packages.search.index_files_missing_for_docs"> - <source>Index files were missing from search-server for your locale. The search operation was performed using the default locale. Assuming data exists in database for your locale, indexes can be regenerated by running: service rhn-search cleanindex, then restart rhn-search</source> + <source>Index files were missing from search-server for your locale. The search operation was performed using the default locale. Assuming data exists in database for your locale, indexes can be regenerated by running: /usr/sbin/rhn-search cleanindex, then restart rhn-search</source> <context-group name="ctx"> <context context-type="sourcefile">/rhn/channels/Search</context> <context context-type="sourcefile">/rhn/systems/Search</context> <context context-type="sourcefile">/rhn/help/Search</context> <context context-type="sourcefile">/rhn/errata/Search</context> </context-group> - <target>ご利用言語の検索サーバーではインデックスファイルがありませんでした。検索の操作はデフォルト言語を使って行われました。ご利用言語のデータベースにデータが存在している場合は、service rhn-search cleanindex を実行するとインデックスを再生成することができます。再生成後に rhn-search を再開してください。</target> + <target>ご利用言語の検索サーバーではインデックスファイルがありませんでした。検索の操作はデフォルト言語を使って行われました。ご利用言語のデータベースにデータが存在している場合は、/usr/sbin/rhn-search cleanindex を実行するとインデックスを再生成することができます。再生成後に rhn-search を再開してください。</target> </trans-unit> <trans-unit id="packages.search.could_not_execute_query"> <source>Could not execute query '{0}'.</source> @@ -2979,11 +2979,11 @@ rhn-kickstart* パッケージが利用可能であることを確認します <target>クエリ '{0}' を実行できませんでした。</target> </trans-unit> <trans-unit id="searchserver.index_out_of_sync_with_db"> - <source>SearchServer index and database entries appear to be out of sync. Please run 'service rhn-search cleanindex'</source> + <source>SearchServer index and database entries appear to be out of sync. Please run '/usr/sbin/rhn-search cleanindex'</source> <context-group name="ctx"> <context context-type="sourcefile">/rhn/channels/Search</context> </context-group> - <target>SearchServer インデックスおよびデータベースエントリが同期されていないようです。'service rhn-search cleanindex' を実行してください。</target> + <target>SearchServer インデックスおよびデータベースエントリが同期されていないようです。'/usr/sbin/rhn-search cleanindex' を実行してください。</target> </trans-unit> <trans-unit id="patches.installed.notavailable"> <source>Not Available</source> diff --git a/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_ko.xml b/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_ko.xml index 7bdffae..3902aa8 100644 --- a/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_ko.xml +++ b/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_ko.xml @@ -2949,24 +2949,24 @@ rhn-tools 채널의 satellite 동기화를 요청하고 다시 시도해야 <target>'{0}' 질의를 구문 분석할 수 없습니다. </target> </trans-unit> <trans-unit id="packages.search.index_files_missing"> - <source>Index files missing from search-server. Assuming data exists in database, indexes can be regenerated by running: service rhn-search cleanindex, then restart rhn-search</source> + <source>Index files missing from search-server. Assuming data exists in database, indexes can be regenerated by running: /usr/sbin/rhn-search cleanindex, then restart rhn-search</source> <context-group name="ctx"> <context context-type="sourcefile">/rhn/channels/Search</context> <context context-type="sourcefile">/rhn/systems/Search</context> <context context-type="sourcefile">/rhn/help/Search</context> <context context-type="sourcefile">/rhn/errata/Search</context> </context-group> - <target>검색 서버에 색인 파일이 없습니다. 데이터베이스에 데이터가 있다고 가정할 경우, service rhn-search cleanindex를 실행하여 색인을 다시 생성한 후 rhn-search를 재시작할 수 있습니다. </target> + <target>검색 서버에 색인 파일이 없습니다. 데이터베이스에 데이터가 있다고 가정할 경우, /usr/sbin/rhn-search cleanindex를 실행하여 색인을 다시 생성한 후 rhn-search를 재시작할 수 있습니다. </target> </trans-unit> <trans-unit id="packages.search.index_files_missing_for_docs"> - <source>Index files were missing from search-server for your locale. The search operation was performed using the default locale. Assuming data exists in database for your locale, indexes can be regenerated by running: service rhn-search cleanindex, then restart rhn-search</source> + <source>Index files were missing from search-server for your locale. The search operation was performed using the default locale. Assuming data exists in database for your locale, indexes can be regenerated by running: /usr/sbin/rhn-search cleanindex, then restart rhn-search</source> <context-group name="ctx"> <context context-type="sourcefile">/rhn/channels/Search</context> <context context-type="sourcefile">/rhn/systems/Search</context> <context context-type="sourcefile">/rhn/help/Search</context> <context context-type="sourcefile">/rhn/errata/Search</context> </context-group> - <target>해당 로케일의 검색 서버에 색인 파일이 누락되어 있습니다. 검색 작업은 디폴트 로케일을 사용하여 실행됩니다. 해당 로케일의 데이터베이스에 데이터가 있을 경우 service rhn-search cleanindex를 실행하면 색인 파일을 다시 생성할 수 있습니다. 그 후 rhn-search를 다시 시작합니다</target> + <target>해당 로케일의 검색 서버에 색인 파일이 누락되어 있습니다. 검색 작업은 디폴트 로케일을 사용하여 실행됩니다. 해당 로케일의 데이터베이스에 데이터가 있을 경우 /usr/sbin/rhn-search cleanindex를 실행하면 색인 파일을 다시 생성할 수 있습니다. 그 후 rhn-search를 다시 시작합니다</target> </trans-unit> <trans-unit id="packages.search.could_not_execute_query"> <source>Could not execute query '{0}'.</source> @@ -2979,11 +2979,11 @@ rhn-tools 채널의 satellite 동기화를 요청하고 다시 시도해야 <target>'{0}' 질의를 실행할 수 없습니다. </target> </trans-unit> <trans-unit id="searchserver.index_out_of_sync_with_db"> - <source>SearchServer index and database entries appear to be out of sync. Please run 'service rhn-search cleanindex'</source> + <source>SearchServer index and database entries appear to be out of sync. Please run '/usr/sbin/rhn-search cleanindex'</source> <context-group name="ctx"> <context context-type="sourcefile">/rhn/channels/Search</context> </context-group> - <target>검색 서버 인덱스와 데이터베이스 항목이 동기화되어 있지 않은 것 같습니다. 'service rhn-search cleanindex'를 실행하십시오</target> + <target>검색 서버 인덱스와 데이터베이스 항목이 동기화되어 있지 않은 것 같습니다. '/usr/sbin/rhn-search cleanindex'를 실행하십시오</target> </trans-unit> <trans-unit id="patches.installed.notavailable"> <source>Not Available</source> diff --git a/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_pa.xml b/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_pa.xml index b3a32fb..b94331a 100644 --- a/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_pa.xml +++ b/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_pa.xml @@ -2789,14 +2789,14 @@ available for this kickstart profile to function properly. <target>'{0}' ਬੇਨਤੀ ਨੂੰ ਪਾਰਸ ਨਹੀਂ ਕੀਤਾ ਜਾ ਸਕਿਆ।</target> </trans-unit> <trans-unit id="packages.search.index_files_missing"> - <source>Index files missing from search-server. Assuming data exists in database, indexes can be regenerated by running: service rhn-search cleanindex, then restart rhn-search</source> + <source>Index files missing from search-server. Assuming data exists in database, indexes can be regenerated by running: /usr/sbin/rhn-search cleanindex, then restart rhn-search</source> <context-group name="ctx"> <context context-type="sourcefile">/rhn/channels/Search</context> <context context-type="sourcefile">/rhn/systems/Search</context> <context context-type="sourcefile">/rhn/help/Search</context> <context context-type="sourcefile">/rhn/errata/Search</context> </context-group> - <target>ਖੋਜ-ਸਰਵਰ ਤੋਂ ਸੂਚੀ ਫਾਇਲਾਂ ਗੈਰ-ਮੌਜੂਦ ਹਨ। ਇਹ ਮੰਨ ਕੇ ਕਿ ਡਾਟਾਬੇਸ ਵਿੱਚ ਡਾਟਾ ਮੌਜੂਦ ਹੈ, ਸੂਚੀਆਂ ਨੂੰ ਇਸ ਕਮਾਂਡ ਨਾਲ ਮੁੜ-ਬਣਾਇਆ ਜਾ ਸਕਦਾ ਹੈ: service rhn-search cleanindex, ਫਿਰ restart rhn-search</target> + <target>ਖੋਜ-ਸਰਵਰ ਤੋਂ ਸੂਚੀ ਫਾਇਲਾਂ ਗੈਰ-ਮੌਜੂਦ ਹਨ। ਇਹ ਮੰਨ ਕੇ ਕਿ ਡਾਟਾਬੇਸ ਵਿੱਚ ਡਾਟਾ ਮੌਜੂਦ ਹੈ, ਸੂਚੀਆਂ ਨੂੰ ਇਸ ਕਮਾਂਡ ਨਾਲ ਮੁੜ-ਬਣਾਇਆ ਜਾ ਸਕਦਾ ਹੈ: /usr/sbin/rhn-search cleanindex, ਫਿਰ restart rhn-search</target> </trans-unit> <trans-unit id="packages.search.could_not_execute_query"> <source>Could not execute query '{0}'.</source> @@ -2809,7 +2809,7 @@ available for this kickstart profile to function properly. <target>'{0}' ਬੇਨਤੀ ਨੂੰ ਚਲਾ ਨਹੀਂ ਸਕਿਆ।</target> </trans-unit> <trans-unit id="searchserver.index_out_of_sync_with_db"> - <source>SearchServer index and database entries appear to be out of sync. Please run 'service rhn-search cleanindex'</source> + <source>SearchServer index and database entries appear to be out of sync. Please run '/usr/sbin/rhn-search cleanindex'</source> <context-group name="ctx"> <context context-type="sourcefile">/rhn/channels/Search</context> </context-group> diff --git a/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_pt_BR.xml b/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_pt_BR.xml index 99df77d..37b89c1 100644 --- a/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_pt_BR.xml +++ b/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_pt_BR.xml @@ -2938,24 +2938,24 @@ disponíveis para seu perfil kickstart funcionar corretamente./n</li> <target>Não foi possível analisar a consulta {0}.</target> </trans-unit> <trans-unit id="packages.search.index_files_missing"> - <source>Index files missing from search-server. Assuming data exists in database, indexes can be regenerated by running: service rhn-search cleanindex, then restart rhn-search</source> + <source>Index files missing from search-server. Assuming data exists in database, indexes can be regenerated by running: /usr/sbin/rhn-search cleanindex, then restart rhn-search</source> <context-group name="ctx"> <context context-type="sourcefile">/rhn/channels/Search</context> <context context-type="sourcefile">/rhn/systems/Search</context> <context context-type="sourcefile">/rhn/help/Search</context> <context context-type="sourcefile">/rhn/errata/Search</context> </context-group> - <target>Os arquivos de Índice estão faltando na procura de servidor. Se a data existe no banco de dados, os índices podem ser gerados novamente, rodando: service rhn-search cleanindex, e depois reiniciar o rhn-search</target> + <target>Os arquivos de Índice estão faltando na procura de servidor. Se a data existe no banco de dados, os índices podem ser gerados novamente, rodando: /usr/sbin/rhn-search cleanindex, e depois reiniciar o rhn-search</target> </trans-unit> <trans-unit id="packages.search.index_files_missing_for_docs"> - <source>Index files were missing from search-server for your locale. The search operation was performed using the default locale. Assuming data exists in database for your locale, indexes can be regenerated by running: service rhn-search cleanindex, then restart rhn-search</source> + <source>Index files were missing from search-server for your locale. The search operation was performed using the default locale. Assuming data exists in database for your locale, indexes can be regenerated by running: /usr/sbin/rhn-search cleanindex, then restart rhn-search</source> <context-group name="ctx"> <context context-type="sourcefile">/rhn/channels/Search</context> <context context-type="sourcefile">/rhn/systems/Search</context> <context context-type="sourcefile">/rhn/help/Search</context> <context context-type="sourcefile">/rhn/errata/Search</context> </context-group> - <target>Os arquivos de Índice estão faltando na procura de servidor para seu idioma. A operação de busca foi realizada utilizando o idioma padrão. Se a data existe no banco de dados em seu idioma, os índices podem ser gerados novamente, rodando: service rhn-search cleanindex, e depois reiniciar o rhn-search</target> + <target>Os arquivos de Índice estão faltando na procura de servidor para seu idioma. A operação de busca foi realizada utilizando o idioma padrão. Se a data existe no banco de dados em seu idioma, os índices podem ser gerados novamente, rodando: /usr/sbin/rhn-search cleanindex, e depois reiniciar o rhn-search</target> </trans-unit> <trans-unit id="packages.search.could_not_execute_query"> <source>Could not execute query '{0}'.</source> @@ -2968,11 +2968,11 @@ disponíveis para seu perfil kickstart funcionar corretamente./n</li> <target>Não foi possível executar a consulta '{0}'.</target> </trans-unit> <trans-unit id="searchserver.index_out_of_sync_with_db"> - <source>SearchServer index and database entries appear to be out of sync. Please run 'service rhn-search cleanindex'</source> + <source>SearchServer index and database entries appear to be out of sync. Please run '/usr/sbin/rhn-search cleanindex'</source> <context-group name="ctx"> <context context-type="sourcefile">/rhn/channels/Search</context> </context-group> - <target>Índice SearchServer e entradas do banco de dados parecem estar fora do sync. Por favor rode ' service rhn-search cleanindex'</target> + <target>Índice SearchServer e entradas do banco de dados parecem estar fora do sync. Por favor rode ' /usr/sbin/rhn-search cleanindex'</target> </trans-unit> <trans-unit id="patches.installed.notavailable"> <source>Not Available</source> diff --git a/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_ru.xml b/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_ru.xml index aa071ad..5ef9e97 100644 --- a/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_ru.xml +++ b/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_ru.xml @@ -2945,24 +2945,24 @@ available for this kickstart profile to function properly. <target>Невозможно разобрать запрос "{0}"</target> </trans-unit> <trans-unit id="packages.search.index_files_missing"> - <source>Index files missing from search-server. Assuming data exists in database, indexes can be regenerated by running: service rhn-search cleanindex, then restart rhn-search</source> + <source>Index files missing from search-server. Assuming data exists in database, indexes can be regenerated by running: /usr/sbin/rhn-search cleanindex, then restart rhn-search</source> <context-group name="ctx"> <context context-type="sourcefile">/rhn/channels/Search</context> <context context-type="sourcefile">/rhn/systems/Search</context> <context context-type="sourcefile">/rhn/help/Search</context> <context context-type="sourcefile">/rhn/errata/Search</context> </context-group> - <target>На сервере поиска отсутствуют индексные файлы. Если база данных содержит данные, индексы можно пересоздать, выполнив команду service rhn-search cleanindex и перезапустив rhn-search</target> + <target>На сервере поиска отсутствуют индексные файлы. Если база данных содержит данные, индексы можно пересоздать, выполнив команду /usr/sbin/rhn-search cleanindex и перезапустив rhn-search</target> </trans-unit> <trans-unit id="packages.search.index_files_missing_for_docs"> - <source>Index files were missing from search-server for your locale. The search operation was performed using the default locale. Assuming data exists in database for your locale, indexes can be regenerated by running: service rhn-search cleanindex, then restart rhn-search</source> + <source>Index files were missing from search-server for your locale. The search operation was performed using the default locale. Assuming data exists in database for your locale, indexes can be regenerated by running: /usr/sbin/rhn-search cleanindex, then restart rhn-search</source> <context-group name="ctx"> <context context-type="sourcefile">/rhn/channels/Search</context> <context context-type="sourcefile">/rhn/systems/Search</context> <context context-type="sourcefile">/rhn/help/Search</context> <context context-type="sourcefile">/rhn/errata/Search</context> </context-group> - <target>Сервер поиска не содержит индексные файлы для выбранного языка. Для выполнения поиска был выбран стандартный язык. Если база данных содержит данные для интересующего языка, индексы можно пересоздать, выполнив команду service rhn-search cleanindex и перезапустив rhn-search</target> + <target>Сервер поиска не содержит индексные файлы для выбранного языка. Для выполнения поиска был выбран стандартный язык. Если база данных содержит данные для интересующего языка, индексы можно пересоздать, выполнив команду /usr/sbin/rhn-search cleanindex и перезапустив rhn-search</target> </trans-unit> <trans-unit id="packages.search.could_not_execute_query"> <source>Could not execute query '{0}'.</source> @@ -2975,11 +2975,11 @@ available for this kickstart profile to function properly. <target>Не удалось выполнить запрос «{0}».</target> </trans-unit> <trans-unit id="searchserver.index_out_of_sync_with_db"> - <source>SearchServer index and database entries appear to be out of sync. Please run 'service rhn-search cleanindex'</source> + <source>SearchServer index and database entries appear to be out of sync. Please run '/usr/sbin/rhn-search cleanindex'</source> <context-group name="ctx"> <context context-type="sourcefile">/rhn/channels/Search</context> </context-group> - <target>Рекомендуется синхронизировать индекс SearchServer с базой данных: «service rhn-search cleanindex»</target> + <target>Рекомендуется синхронизировать индекс SearchServer с базой данных: «/usr/sbin/rhn-search cleanindex»</target> </trans-unit> <trans-unit id="patches.installed.notavailable"> <source>Not Available</source> diff --git a/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_ta.xml b/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_ta.xml index cdbb89a..4c30fe6 100644 --- a/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_ta.xml +++ b/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_ta.xml @@ -2787,14 +2787,14 @@ available for this kickstart profile to function properly. <target>வினாவை திருத்த முடியவில்லை '{0}'.</target> </trans-unit> <trans-unit id="packages.search.index_files_missing"> - <source>Index files missing from search-server. Assuming data exists in database, indexes can be regenerated by running: service rhn-search cleanindex, then restart rhn-search</source> + <source>Index files missing from search-server. Assuming data exists in database, indexes can be regenerated by running: /usr/sbin/rhn-search cleanindex, then restart rhn-search</source> <context-group name="ctx"> <context context-type="sourcefile">/rhn/channels/Search</context> <context context-type="sourcefile">/rhn/systems/Search</context> <context context-type="sourcefile">/rhn/help/Search</context> <context context-type="sourcefile">/rhn/errata/Search</context> </context-group> - <target>சுட்டி கோப்புகள் ணேவையக தேடலில் இருந்து விடுபடுகிறது. தரவுத்தளத்திலிருந்து தரவுகளை பெற்றுள்ளது, சுட்டி மீண்டும்துவங்கி இயங்குகிறது: service rhn-search cleanindex, பின்பு மீண்டும் துவக்கி rhn-தேடவும்</target> + <target>சுட்டி கோப்புகள் ணேவையக தேடலில் இருந்து விடுபடுகிறது. தரவுத்தளத்திலிருந்து தரவுகளை பெற்றுள்ளது, சுட்டி மீண்டும்துவங்கி இயங்குகிறது: /usr/sbin/rhn-search cleanindex, பின்பு மீண்டும் துவக்கி rhn-தேடவும்</target> </trans-unit> <trans-unit id="packages.search.could_not_execute_query"> <source>Could not execute query '{0}'.</source> @@ -2807,7 +2807,7 @@ available for this kickstart profile to function properly. <target>வினாவை திருத்த முடியவில்லை '{0}'.</target> </trans-unit> <trans-unit id="searchserver.index_out_of_sync_with_db"> - <source>SearchServer index and database entries appear to be out of sync. Please run 'service rhn-search cleanindex'</source> + <source>SearchServer index and database entries appear to be out of sync. Please run '/usr/sbin/rhn-search cleanindex'</source> <context-group name="ctx"> <context context-type="sourcefile">/rhn/channels/Search</context> </context-group> diff --git a/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_zh_CN.xml b/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_zh_CN.xml index bbef06b..41faa5c 100644 --- a/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_zh_CN.xml +++ b/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_zh_CN.xml @@ -2949,24 +2949,24 @@ available for this kickstart profile to function properly. <target>不能解释 '{0}' 查询。</target> </trans-unit> <trans-unit id="packages.search.index_files_missing"> - <source>Index files missing from search-server. Assuming data exists in database, indexes can be regenerated by running: service rhn-search cleanindex, then restart rhn-search</source> + <source>Index files missing from search-server. Assuming data exists in database, indexes can be regenerated by running: /usr/sbin/rhn-search cleanindex, then restart rhn-search</source> <context-group name="ctx"> <context context-type="sourcefile">/rhn/channels/Search</context> <context context-type="sourcefile">/rhn/systems/Search</context> <context context-type="sourcefile">/rhn/help/Search</context> <context context-type="sourcefile">/rhn/errata/Search</context> </context-group> - <target>搜索服务器中缺少索引文件。假设数据库中存在数据，可运行以下步骤重新生成索引： service rhn-search cleanindexx，然后 restart rhn-search</target> + <target>搜索服务器中缺少索引文件。假设数据库中存在数据，可运行以下步骤重新生成索引： /usr/sbin/rhn-search cleanindexx，然后 restart rhn-search</target> </trans-unit> <trans-unit id="packages.search.index_files_missing_for_docs"> - <source>Index files were missing from search-server for your locale. The search operation was performed using the default locale. Assuming data exists in database for your locale, indexes can be regenerated by running: service rhn-search cleanindex, then restart rhn-search</source> + <source>Index files were missing from search-server for your locale. The search operation was performed using the default locale. Assuming data exists in database for your locale, indexes can be regenerated by running: /usr/sbin/rhn-search cleanindex, then restart rhn-search</source> <context-group name="ctx"> <context context-type="sourcefile">/rhn/channels/Search</context> <context context-type="sourcefile">/rhn/systems/Search</context> <context context-type="sourcefile">/rhn/help/Search</context> <context context-type="sourcefile">/rhn/errata/Search</context> </context-group> - <target>搜索服务器中缺少您所在区域的索引文件。使用默认区域执行搜索操作。假设数据库中存在您所在区域的数据，可运行 service rhn-search cleanindex，然后 restart rhn-search 重新生成索引。</target> + <target>搜索服务器中缺少您所在区域的索引文件。使用默认区域执行搜索操作。假设数据库中存在您所在区域的数据，可运行 /usr/sbin/rhn-search cleanindex，然后 restart rhn-search 重新生成索引。</target> </trans-unit> <trans-unit id="packages.search.could_not_execute_query"> <source>Could not execute query '{0}'.</source> @@ -2979,11 +2979,11 @@ available for this kickstart profile to function properly. <target>不能执行查询 '{0}'。</target> </trans-unit> <trans-unit id="searchserver.index_out_of_sync_with_db"> - <source>SearchServer index and database entries appear to be out of sync. Please run 'service rhn-search cleanindex'</source> + <source>SearchServer index and database entries appear to be out of sync. Please run '/usr/sbin/rhn-search cleanindex'</source> <context-group name="ctx"> <context context-type="sourcefile">/rhn/channels/Search</context> </context-group> - <target>SearchServer 索引和数据库条目不同步。请运行 'service rhn-search cleanindex'。</target> + <target>SearchServer 索引和数据库条目不同步。请运行 '/usr/sbin/rhn-search cleanindex'。</target> </trans-unit> <trans-unit id="patches.installed.notavailable"> <source>Not Available</source> diff --git a/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_zh_TW.xml b/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_zh_TW.xml index 8ea5233..ea4c9b0 100644 --- a/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_zh_TW.xml +++ b/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_zh_TW.xml @@ -2949,24 +2949,24 @@ available for this kickstart profile to function properly. <target>無法解析 '{0}' 查詢。</target> </trans-unit> <trans-unit id="packages.search.index_files_missing"> - <source>Index files missing from search-server. Assuming data exists in database, indexes can be regenerated by running: service rhn-search cleanindex, then restart rhn-search</source> + <source>Index files missing from search-server. Assuming data exists in database, indexes can be regenerated by running: /usr/sbin/rhn-search cleanindex, then restart rhn-search</source> <context-group name="ctx"> <context context-type="sourcefile">/rhn/channels/Search</context> <context context-type="sourcefile">/rhn/systems/Search</context> <context context-type="sourcefile">/rhn/help/Search</context> <context context-type="sourcefile">/rhn/errata/Search</context> </context-group> - <target>搜尋伺服器的索引檔案遺失。假設資料儲存在資料庫中的話，索引便能透過執行 service rhn-search cleanindex 然後重新啟動 rhn-search 來重新產生。</target> + <target>搜尋伺服器的索引檔案遺失。假設資料儲存在資料庫中的話，索引便能透過執行 /usr/sbin/rhn-search cleanindex 然後重新啟動 rhn-search 來重新產生。</target> </trans-unit> <trans-unit id="packages.search.index_files_missing_for_docs"> - <source>Index files were missing from search-server for your locale. The search operation was performed using the default locale. Assuming data exists in database for your locale, indexes can be regenerated by running: service rhn-search cleanindex, then restart rhn-search</source> + <source>Index files were missing from search-server for your locale. The search operation was performed using the default locale. Assuming data exists in database for your locale, indexes can be regenerated by running: /usr/sbin/rhn-search cleanindex, then restart rhn-search</source> <context-group name="ctx"> <context context-type="sourcefile">/rhn/channels/Search</context> <context context-type="sourcefile">/rhn/systems/Search</context> <context context-type="sourcefile">/rhn/help/Search</context> <context context-type="sourcefile">/rhn/errata/Search</context> </context-group> - <target>您語言區域的搜尋伺服器索引檔案遺失。搜尋作業乃透過使用預設的語言區域來進行的。假設您語言區域的資料若存在資料庫中的話，索引便能透過執行 service rhn-search cleanindex 然後重新啟動 rhn-search 來重新產生。</target> + <target>您語言區域的搜尋伺服器索引檔案遺失。搜尋作業乃透過使用預設的語言區域來進行的。假設您語言區域的資料若存在資料庫中的話，索引便能透過執行 /usr/sbin/rhn-search cleanindex 然後重新啟動 rhn-search 來重新產生。</target> </trans-unit> <trans-unit id="packages.search.could_not_execute_query"> <source>Could not execute query '{0}'.</source> @@ -2979,11 +2979,11 @@ available for this kickstart profile to function properly. <target>無法執行查詢 '{0}'。</target> </trans-unit> <trans-unit id="searchserver.index_out_of_sync_with_db"> - <source>SearchServer index and database entries appear to be out of sync. Please run 'service rhn-search cleanindex'</source> + <source>SearchServer index and database entries appear to be out of sync. Please run '/usr/sbin/rhn-search cleanindex'</source> <context-group name="ctx"> <context context-type="sourcefile">/rhn/channels/Search</context> </context-group> - <target>SearchServer 索引和資料庫項目未同步。請執行「service rhn-search cleanindex」</target> + <target>SearchServer 索引和資料庫項目未同步。請執行「/usr/sbin/rhn-search cleanindex」</target> </trans-unit> <trans-unit id="patches.installed.notavailable"> <source>Not Available</source> diff --git a/search-server/spacewalk-search/spacewalk-search.spec b/search-server/spacewalk-search/spacewalk-search.spec index 209f918..32c3e8c 100644 --- a/search-server/spacewalk-search/spacewalk-search.spec +++ b/search-server/spacewalk-search/spacewalk-search.spec @@ -92,8 +92,8 @@ 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 -%if 0%{?fedora} install -d -m 755 $RPM_BUILD_ROOT%{_sbindir} +%if 0%{?fedora} install -d -m 755 $RPM_BUILD_ROOT%{_unitdir} %else install -d -m 755 $RPM_BUILD_ROOT%{_initrddir} @@ -106,11 +106,11 @@ install -p -m 644 dist/%{name}-%{version}.jar $RPM_BUILD_ROOT%{_prefix}/share/rh # using install -m does not preserve the symlinks cp -d lib/* $RPM_BUILD_ROOT/%{_prefix}/share/rhn/search/lib install -p -m 644 src/config/etc/logrotate.d/rhn-search $RPM_BUILD_ROOT%{_sysconfdir}/logrotate.d/rhn-search -%if 0%{?fedora} install -p -m 755 src/config/rhn-search $RPM_BUILD_ROOT%{_sbindir} +%if 0%{?fedora} install -p -m 755 src/config/rhn-search.service $RPM_BUILD_ROOT%{_unitdir} %else -install -p -m 755 src/config/rhn-search $RPM_BUILD_ROOT%{_initrddir} +install -p -m 755 src/config/rhn-search.init $RPM_BUILD_ROOT%{_initrddir}/rhn-search %endif ln -s -f /usr/sbin/tanukiwrapper $RPM_BUILD_ROOT%{_bindir}/rhnsearchd install -p -m 644 src/config/search/rhn_search.conf $RPM_BUILD_ROOT%{_prefix}/share/rhn/config-defaults/rhn_search.conf @@ -167,8 +167,8 @@ fi %files %attr(755, root, root) %{_var}/log/rhn/search %{_prefix}/share/rhn/search/lib/* -%if 0%{?fedora} %attr(755, root, root) %{_sbindir}/rhn-search +%if 0%{?fedora} %attr(755, root, root) %{_unitdir}/rhn-search.service %else %attr(755, root, root) %{_initrddir}/rhn-search diff --git a/search-server/spacewalk-search/src/config/rhn-search.init b/search-server/spacewalk-search/src/config/rhn-search.init new file mode 100644 index 0000000..914d39c --- /dev/null +++ b/search-server/spacewalk-search/src/config/rhn-search.init @@ -0,0 +1,20 @@ +#! /bin/sh +# +# rhn-search This shell script takes care of starting and stopping +# the java rhn-search server. +# +# chkconfig: - 94 12 +# description: This is Spacewalk search engine. +# +### BEGIN INIT INFO +# Provides: rhn-search +# Required-Start: $local_fs $network satellite-httpd +# Required-Stop: $local_fs $network satellite-httpd +# Default-Start: +# Default-Stop: 0 1 2 3 4 5 6 +# Short-Description: This is Spacewalk search engine. +# Description: This is Spacewalk search engine. +### END INIT INFO + +exec /usr/sbin/rhn-search "$@" +

1 0

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

spacewalk-commits October 2013