Branch 'SPACEWALK-1.3' - schema/spacewalk
by Jan Pazdziora
schema/spacewalk/postgres/triggers/rhnUserGroupMembers.sql | 1 +
1 file changed, 1 insertion(+)
New commits:
commit cccb9f7eb5f70c39113bd70fadcfe98b36f7ef48
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Mon Feb 7 16:29:56 2011 +0100
Need to return new at the end of a trigger function.
Addressing
xmlrpclib.Fault: <Fault -1: 'redstone.xmlrpc.XmlRpcFault: unhandled internal exception: ERROR: -20255 : (cannot_delete_user) - The specified user may not be deleted.'>
which in fact was a
ERROR: control reached end of trigger procedure without RETURN
CONTEXT: PL/pgSQL function "rhn_ugm_applicant_fix_fun"
diff --git a/schema/spacewalk/postgres/triggers/rhnUserGroupMembers.sql b/schema/spacewalk/postgres/triggers/rhnUserGroupMembers.sql
index d0b9998..2fa15e7 100644
--- a/schema/spacewalk/postgres/triggers/rhnUserGroupMembers.sql
+++ b/schema/spacewalk/postgres/triggers/rhnUserGroupMembers.sql
@@ -134,6 +134,7 @@ begin
UPDATE web_contact SET password = old_password WHERE id = old.user_id;
END IF;
END IF;
+ return new;
end;
$$ LANGUAGE PLPGSQL;
13 years, 4 months
backend/spacewalk-backend.spec rel-eng/packages
by Michael Mraka
backend/spacewalk-backend.spec | 6 +++++-
rel-eng/packages/spacewalk-backend | 2 +-
2 files changed, 6 insertions(+), 2 deletions(-)
New commits:
commit 6da150e7237e5630978ef40b3ceae8209f67d039
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Mon Feb 7 15:02:58 2011 +0100
Automatic commit of package [spacewalk-backend] release [1.4.4-1].
diff --git a/backend/spacewalk-backend.spec b/backend/spacewalk-backend.spec
index ecff0b4..9e3103a 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 and Python
-Version: 1.4.3
+Version: 1.4.4
Release: 1%{?dist}
URL: https://fedorahosted.org/spacewalk
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
@@ -684,6 +684,10 @@ rm -f %{rhnconf}/rhnSecret.py*
# $Id$
%changelog
+* Mon Feb 07 2011 Michael Mraka <michael.mraka(a)redhat.com> 1.4.4-1
+- 675359 - modified attribute is not always present
+- l10n: Updates to German (de) translation
+
* Fri Feb 04 2011 Michael Mraka <michael.mraka(a)redhat.com> 1.4.3-1
- 674510 - fixed procedure call (PG)
- 674528 - don't read signatures when there is no rpm (--no-rpms)
diff --git a/rel-eng/packages/spacewalk-backend b/rel-eng/packages/spacewalk-backend
index 0742ac1..968248c 100644
--- a/rel-eng/packages/spacewalk-backend
+++ b/rel-eng/packages/spacewalk-backend
@@ -1 +1 @@
-1.4.3-1 backend/
+1.4.4-1 backend/
13 years, 4 months
Changes to 'refs/tags/spacewalk-search-1.4.1-1'
by Michael Mraka
Tag 'spacewalk-search-1.4.1-1' created by Michael Mraka <michael.mraka(a)redhat.com> at 2011-02-07 13:58 +0000
Tagging package [spacewalk-search] version [1.4.1-1] in directory [search-server/spacewalk-search/].
Changes since osad-5.10.2-1:
Jan Pazdziora (1):
Fixing type (removing extra comma, left there by 3e8b50c53627391ff3e1ef5a46239724b0bcc6d6).
Michael Mraka (7):
added potgresql jdbc to rhn-search path
made service rhn-search cleanindex queries work on PG
fixed package and errata search in PG
add @ to db_name only for oracle (PG)
move config.xml back to jar
don't duplicate files from spacewalk-search.jar on filesystem
Automatic commit of package [spacewalk-search] release [1.4.1-1].
Miroslav Suchý (4):
Revert "Revert "648403 - do not create TB even on Red Hat Enterprise Linux 4""
Revert "Revert "get_server_capability() is defined twice in osad and rhncfg, merge and move to rhnlib and make it member of rpclib.Server""
675164 - do not traceback if file do not differ
628920 - older Satellites do not send selinux_ctx
---
client/rhel/rhnlib/rhn/rpclib.py | 34 ++++++++++
client/tools/osad/osad.spec | 2
client/tools/osad/src/osad.py | 31 ---------
client/tools/rhncfg/config_client/rhncfgcli_verify.py | 2
client/tools/rhncfg/config_common/repository.py | 31 ---------
client/tools/rhncfg/config_management/rhncfg_diff.py | 2
client/tools/rhncfg/rhncfg.spec | 2
client/tools/rhnpush/rhnpush.spec | 3
client/tools/rhnpush/uploadLib.py | 23 ++----
java/code/src/com/redhat/rhn/domain/channel/Channel.hbm.xml | 2
rel-eng/packages/spacewalk-search | 2
search-server/spacewalk-search/build.xml | 2
search-server/spacewalk-search/spacewalk-search.spec | 15 ++--
search-server/spacewalk-search/src/config/com/redhat/satellite/search/db/config.xml | 3
search-server/spacewalk-search/src/config/com/redhat/satellite/search/db/errata.xml | 2
search-server/spacewalk-search/src/config/com/redhat/satellite/search/db/hwdevice.xml | 2
search-server/spacewalk-search/src/config/com/redhat/satellite/search/db/package.xml | 2
search-server/spacewalk-search/src/config/com/redhat/satellite/search/db/server.xml | 2
search-server/spacewalk-search/src/config/com/redhat/satellite/search/db/server_custom_info.xml | 2
search-server/spacewalk-search/src/config/com/redhat/satellite/search/db/snapshot_tag.xml | 2
search-server/spacewalk-search/src/config/rhn-search | 6 -
search-server/spacewalk-search/src/config/search/rhn_search_daemon.conf | 2
search-server/spacewalk-search/src/java/com/redhat/satellite/search/db/DatabaseManager.java | 6 +
search-server/spacewalk-search/src/java/com/redhat/satellite/search/rpc/handlers/IndexHandler.java | 4 -
24 files changed, 81 insertions(+), 103 deletions(-)
---
13 years, 4 months
rel-eng/packages search-server/spacewalk-search
by Michael Mraka
rel-eng/packages/spacewalk-search | 2 +-
search-server/spacewalk-search/spacewalk-search.spec | 10 +++++++++-
2 files changed, 10 insertions(+), 2 deletions(-)
New commits:
commit 6dbd8e50dc5985c2ee8f31210c55fb7bb939f810
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Mon Feb 7 14:58:26 2011 +0100
Automatic commit of package [spacewalk-search] release [1.4.1-1].
diff --git a/rel-eng/packages/spacewalk-search b/rel-eng/packages/spacewalk-search
index 8bf92b5..a87d684 100644
--- a/rel-eng/packages/spacewalk-search
+++ b/rel-eng/packages/spacewalk-search
@@ -1 +1 @@
-1.3.7-1 search-server/spacewalk-search/
+1.4.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 8308024..f734202 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.4.0
+Version: 1.4.1
Release: 1%{?dist}
# This src.rpm is cannonical upstream
# You can obtain it using this set of commands
@@ -117,6 +117,14 @@ fi
%{_sysconfdir}/logrotate.d/rhn-search
%changelog
+* Mon Feb 07 2011 Michael Mraka <michael.mraka(a)redhat.com> 1.4.1-1
+- don't duplicate files from spacewalk-search.jar on filesystem
+- move config.xml back to jar
+- add @ to db_name only for oracle (PG)
+- fixed package and errata search in PG
+- made service rhn-search cleanindex queries work on PG
+- added potgresql jdbc to rhn-search path
+
* Wed Jan 26 2011 Tomas Lestach <tlestach(a)redhat.com> 1.3.7-1
- remove exceptions from method declarations that aren't thrown
(tlestach(a)redhat.com)
13 years, 4 months
6 commits - search-server/spacewalk-search
by Michael Mraka
search-server/spacewalk-search/build.xml | 2 +-
search-server/spacewalk-search/spacewalk-search.spec | 5 -----
search-server/spacewalk-search/src/config/com/redhat/satellite/search/db/config.xml | 3 +--
search-server/spacewalk-search/src/config/com/redhat/satellite/search/db/errata.xml | 2 +-
search-server/spacewalk-search/src/config/com/redhat/satellite/search/db/hwdevice.xml | 2 +-
search-server/spacewalk-search/src/config/com/redhat/satellite/search/db/package.xml | 2 +-
search-server/spacewalk-search/src/config/com/redhat/satellite/search/db/server.xml | 2 +-
search-server/spacewalk-search/src/config/com/redhat/satellite/search/db/server_custom_info.xml | 2 +-
search-server/spacewalk-search/src/config/com/redhat/satellite/search/db/snapshot_tag.xml | 2 +-
search-server/spacewalk-search/src/config/rhn-search | 6 +++---
search-server/spacewalk-search/src/config/search/rhn_search_daemon.conf | 2 ++
search-server/spacewalk-search/src/java/com/redhat/satellite/search/db/DatabaseManager.java | 6 ++++--
search-server/spacewalk-search/src/java/com/redhat/satellite/search/rpc/handlers/IndexHandler.java | 4 ++--
13 files changed, 19 insertions(+), 21 deletions(-)
New commits:
commit 1b0da0722612e2cac5be406932fe0a53225ab915
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Mon Feb 7 14:36:53 2011 +0100
don't duplicate files from spacewalk-search.jar on filesystem
diff --git a/search-server/spacewalk-search/spacewalk-search.spec b/search-server/spacewalk-search/spacewalk-search.spec
index c4caadf..8308024 100644
--- a/search-server/spacewalk-search/spacewalk-search.spec
+++ b/search-server/spacewalk-search/spacewalk-search.spec
@@ -76,7 +76,6 @@ install -d -m 755 $RPM_BUILD_ROOT%{_sysconfdir}/rhn/search
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%{_prefix}/share/rhn/search/classes/com/redhat/satellite/search/db
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
@@ -85,9 +84,7 @@ install -d -m 755 $RPM_BUILD_ROOT%{_sysconfdir}/logrotate.d
install -p -m 644 dist/%{name}-%{version}.jar $RPM_BUILD_ROOT%{_prefix}/share/rhn/search/lib/
# 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/log4j.properties $RPM_BUILD_ROOT/%{_prefix}/share/rhn/search/classes/log4j.properties
install -p -m 644 src/config/etc/logrotate.d/rhn-search $RPM_BUILD_ROOT%{_sysconfdir}/logrotate.d/rhn-search
-install -p -m 644 src/config/com/redhat/satellite/search/db/* $RPM_BUILD_ROOT%{_prefix}/share/rhn/search/classes/com/redhat/satellite/search/db
install -p -m 755 src/config/rhn-search $RPM_BUILD_ROOT%{_initrddir}
ln -s -f /usr/sbin/tanukiwrapper $RPM_BUILD_ROOT%{_bindir}/rhnsearchd
install -p -m 644 src/config/search/rhn_search.conf $RPM_BUILD_ROOT%{_sysconfdir}/rhn/search/rhn_search.conf
@@ -111,8 +108,6 @@ fi
%defattr(644,root,root,755)
%attr(755, root, root) %{_var}/log/rhn/search
%{_prefix}/share/rhn/search/lib/*
-%{_prefix}/share/rhn/search/classes/log4j.properties
-%{_prefix}/share/rhn/search/classes/com/*
%attr(755, root, root) %{_prefix}/share/rhn/search/indexes
%attr(755, root, root) %{_initrddir}/rhn-search
%attr(755, root, root) %{_bindir}/rhnsearchd
commit b36f27ac8067825ea6734411f8b5e9eb2f171743
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Mon Feb 7 14:07:18 2011 +0100
move config.xml back to jar
Revert "Fixed build.xml to not include config.xml in the build"
Revert "Updated rhn-search to include config.xml on the filesystem"
This reverts commit c24051b81949ef19013ffb7cdc7604605fddd350.
This reverts commit c052fde91e9b6eff1d0bedf9bdbd234a4ec1baa1.
diff --git a/search-server/spacewalk-search/build.xml b/search-server/spacewalk-search/build.xml
index 276c8fe..de8e25f 100644
--- a/search-server/spacewalk-search/build.xml
+++ b/search-server/spacewalk-search/build.xml
@@ -169,7 +169,7 @@
<target name="package" depends="compile">
<jar basedir="${build.dir}"
destfile="${dist.dir}/${jar.file.name}"
- excludes="**/tests/**, **/db/config.xml"
+ excludes="**/tests/**"
includes="**/**" />
</target>
diff --git a/search-server/spacewalk-search/src/config/rhn-search b/search-server/spacewalk-search/src/config/rhn-search
index 5ffb659..1429d17 100644
--- a/search-server/spacewalk-search/src/config/rhn-search
+++ b/search-server/spacewalk-search/src/config/rhn-search
@@ -77,7 +77,7 @@ unlock() {
removeindex() {
JAVA_LIBRARY_PATH='-Djava.library.path=/usr/lib/oracle/11.2/client/lib:/usr/lib/oracle/11.2/client64/lib:/usr/lib/gcj/postgresql-jdbc:/usr/lib64/gcj/postgresql-jdbc'
SEARCH_CLASS_PATH=`build-classpath-directory /usr/share/rhn/search/lib /usr/share/java/ojdbc14.jar /usr/share/java/postgresql-jdbc.jar`
- CLASSPATH=/usr/share/rhn/search/classes:${SEARCH_CLASS_PATH} java $JAVA_LIBRARY_PATH com.redhat.satellite.search.DeleteIndexes
+ CLASSPATH=${SEARCH_CLASS_PATH} java $JAVA_LIBRARY_PATH com.redhat.satellite.search.DeleteIndexes
}
# Do not modify anything beyond this point
commit 8d6f33908d5cbf794e65e7de7e3458b59cb3e6db
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Mon Feb 7 13:34:35 2011 +0100
add @ to db_name only for oracle (PG)
also removed defaultStatementTimeout because postgresql doesn't understand it
diff --git a/search-server/spacewalk-search/src/config/com/redhat/satellite/search/db/config.xml b/search-server/spacewalk-search/src/config/com/redhat/satellite/search/db/config.xml
index 4038c8b..4fb411b 100644
--- a/search-server/spacewalk-search/src/config/com/redhat/satellite/search/db/config.xml
+++ b/search-server/spacewalk-search/src/config/com/redhat/satellite/search/db/config.xml
@@ -15,14 +15,13 @@
maxSessions="10"
maxTransactions="10"
useStatementNamespaces="false"
- defaultStatementTimeout="30"
/>
<!-- Configure a datasource to use with this SQL Map using SimpleDataSource.
Notice the use of the properties from the above resource -->
<transactionManager type="JDBC" >
<dataSource type="SIMPLE">
<property name="JDBC.Driver" value="${search.connection.driver_class}"/>
- <property name="JDBC.ConnectionURL" value="${search.connection.driver_proto}:@${db_name}"/>
+ <property name="JDBC.ConnectionURL" value="${search.connection.driver_proto}:${db_name}"/>
<property name="JDBC.Username" value="${db_user}"/>
<property name="JDBC.Password" value="${db_password}"/>
</dataSource>
diff --git a/search-server/spacewalk-search/src/java/com/redhat/satellite/search/db/DatabaseManager.java b/search-server/spacewalk-search/src/java/com/redhat/satellite/search/db/DatabaseManager.java
index 1a8f71d..5ffac00 100644
--- a/search-server/spacewalk-search/src/java/com/redhat/satellite/search/db/DatabaseManager.java
+++ b/search-server/spacewalk-search/src/java/com/redhat/satellite/search/db/DatabaseManager.java
@@ -60,11 +60,13 @@ public class DatabaseManager {
}
Properties overrides = config.getNamespaceProperties("search");
- String[] options = {"db_name", "db_password", "db_user",
- "db_host", "db_port", "db_name"};
+ String[] options = {"db_name", "db_password", "db_user"};
for (String option : options) {
overrides.setProperty(option, config.getString(option));
}
+ if (config.getString("db_backend").equals("oracle")) {
+ overrides.setProperty("db_name", "@" + overrides.getProperty("db_name"));
+ }
client = SqlMapClientBuilder.buildSqlMapClient(reader, overrides);
}
commit 7b545fb2392a6f5116438d2fad4f45e4c8edc7ae
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Mon Feb 7 11:52:54 2011 +0100
fixed package and errata search in PG
diff --git a/search-server/spacewalk-search/src/java/com/redhat/satellite/search/rpc/handlers/IndexHandler.java b/search-server/spacewalk-search/src/java/com/redhat/satellite/search/rpc/handlers/IndexHandler.java
index 377497b..d986810 100644
--- a/search-server/spacewalk-search/src/java/com/redhat/satellite/search/rpc/handlers/IndexHandler.java
+++ b/search-server/spacewalk-search/src/java/com/redhat/satellite/search/rpc/handlers/IndexHandler.java
@@ -174,9 +174,9 @@ public class IndexHandler {
}
return Collections.EMPTY_LIST;
}
- List<String> ids = new ArrayList<String>();
+ List<Long> ids = new ArrayList<Long>();
for (Result pr : hits) {
- ids.add(pr.getId());
+ ids.add(new Long(pr.getId()));
}
Query<String> query = null;
commit c39a4e05ccdd86e7335bfb3facceb94de5e58fa0
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Mon Feb 7 11:14:22 2011 +0100
made service rhn-search cleanindex queries work on PG
--- Cause: org.postgresql.util.PSQLException: ERROR: syntax error at or near "rhnIndexerWork"
Position: 14
at com.ibatis.sqlmap.engine.mapping.statement.GeneralStatement.executeUpdate(GeneralStatement.java:91)
at com.ibatis.sqlmap.engine.impl.SqlMapExecutorDelegate.update(SqlMapExecutorDelegate.java:505)
at com.ibatis.sqlmap.engine.impl.SqlMapExecutorDelegate.delete(SqlMapExecutorDelegate.java:528)
at com.ibatis.sqlmap.engine.impl.SqlMapSessionImpl.delete(SqlMapSessionImpl.java:98)
at com.redhat.satellite.search.db.WriteQuery.delete(WriteQuery.java:72)
at com.redhat.satellite.search.DeleteIndexes.deleteQuery(DeleteIndexes.java:87)
at com.redhat.satellite.search.DeleteIndexes.main(DeleteIndexes.java:118)
Caused by: org.postgresql.util.PSQLException: ERROR: syntax error at or near "rhnIndexerWork"
Position: 14
at org.postgresql.core.v3.QueryExecutorImpl.receiveErrorResponse(QueryExecutorImpl.java:2062)
at org.postgresql.core.v3.QueryExecutorImpl.processResults(QueryExecutorImpl.java:1795)
at org.postgresql.core.v3.QueryExecutorImpl.execute(QueryExecutorImpl.java:257)
at org.postgresql.jdbc2.AbstractJdbc2Statement.execute(AbstractJdbc2Statement.java:479)
at org.postgresql.jdbc2.AbstractJdbc2Statement.executeWithFlags(AbstractJdbc2Statement.java:367)
at org.postgresql.jdbc2.AbstractJdbc2Statement.execute(AbstractJdbc2Statement.java:360)
at com.ibatis.sqlmap.engine.execution.SqlExecutor.executeUpdate(SqlExecutor.java:81)
at com.ibatis.sqlmap.engine.mapping.statement.GeneralStatement.sqlExecuteUpdate(GeneralStatement.java:200)
at com.ibatis.sqlmap.engine.mapping.statement.GeneralStatement.executeUpdate(GeneralStatement.java:78)
... 6 more
diff --git a/search-server/spacewalk-search/src/config/com/redhat/satellite/search/db/errata.xml b/search-server/spacewalk-search/src/config/com/redhat/satellite/search/db/errata.xml
index 13c5985..d9f9d80 100644
--- a/search-server/spacewalk-search/src/config/com/redhat/satellite/search/db/errata.xml
+++ b/search-server/spacewalk-search/src/config/com/redhat/satellite/search/db/errata.xml
@@ -29,7 +29,7 @@
ORDER by e.id ASC
</select>
<delete id="deleteLastErrata">
- DELETE rhnIndexerWork where object_type = 'errata'
+ DELETE FROM rhnIndexerWork where object_type = 'errata'
</delete>
<insert id="createLastErrata"
parameterClass="java.util.Map">
diff --git a/search-server/spacewalk-search/src/config/com/redhat/satellite/search/db/hwdevice.xml b/search-server/spacewalk-search/src/config/com/redhat/satellite/search/db/hwdevice.xml
index 70d6d8a..de205c5 100644
--- a/search-server/spacewalk-search/src/config/com/redhat/satellite/search/db/hwdevice.xml
+++ b/search-server/spacewalk-search/src/config/com/redhat/satellite/search/db/hwdevice.xml
@@ -28,7 +28,7 @@
<delete id="deleteLastHardwareDevice">
- DELETE rhnIndexerWork where object_type = 'hwdevice'
+ DELETE FROM rhnIndexerWork where object_type = 'hwdevice'
</delete>
<insert id="createLastHardwareDevice"
parameterClass="java.util.Map">
diff --git a/search-server/spacewalk-search/src/config/com/redhat/satellite/search/db/package.xml b/search-server/spacewalk-search/src/config/com/redhat/satellite/search/db/package.xml
index 46e84d5..1972292 100644
--- a/search-server/spacewalk-search/src/config/com/redhat/satellite/search/db/package.xml
+++ b/search-server/spacewalk-search/src/config/com/redhat/satellite/search/db/package.xml
@@ -47,7 +47,7 @@
ORDER by p.id ASC
</select>
<delete id="deleteLastPackage">
- DELETE rhnIndexerWork where object_type = 'package'
+ DELETE FROM rhnIndexerWork where object_type = 'package'
</delete>
<insert id="createLastPackage"
parameterClass="java.util.Map">
diff --git a/search-server/spacewalk-search/src/config/com/redhat/satellite/search/db/server.xml b/search-server/spacewalk-search/src/config/com/redhat/satellite/search/db/server.xml
index 71814ea..6596e13 100644
--- a/search-server/spacewalk-search/src/config/com/redhat/satellite/search/db/server.xml
+++ b/search-server/spacewalk-search/src/config/com/redhat/satellite/search/db/server.xml
@@ -69,7 +69,7 @@
</select>
<delete id="deleteLastServer">
- DELETE rhnIndexerWork where object_type = 'server'
+ DELETE FROM rhnIndexerWork where object_type = 'server'
</delete>
<insert id="createLastServer"
parameterClass="java.util.Map">
diff --git a/search-server/spacewalk-search/src/config/com/redhat/satellite/search/db/server_custom_info.xml b/search-server/spacewalk-search/src/config/com/redhat/satellite/search/db/server_custom_info.xml
index c56090c..5e29554 100644
--- a/search-server/spacewalk-search/src/config/com/redhat/satellite/search/db/server_custom_info.xml
+++ b/search-server/spacewalk-search/src/config/com/redhat/satellite/search/db/server_custom_info.xml
@@ -24,7 +24,7 @@
</select>
<delete id="deleteLastServerCustomInfo">
- DELETE rhnIndexerWork where object_type = 'server_custom_info'
+ DELETE FROM rhnIndexerWork where object_type = 'server_custom_info'
</delete>
<insert id="createLastServerCustomInfo"
parameterClass="java.util.Map">
diff --git a/search-server/spacewalk-search/src/config/com/redhat/satellite/search/db/snapshot_tag.xml b/search-server/spacewalk-search/src/config/com/redhat/satellite/search/db/snapshot_tag.xml
index 5d4d67c..6266583 100644
--- a/search-server/spacewalk-search/src/config/com/redhat/satellite/search/db/snapshot_tag.xml
+++ b/search-server/spacewalk-search/src/config/com/redhat/satellite/search/db/snapshot_tag.xml
@@ -26,7 +26,7 @@
<delete id="deleteLastSnapshotTag">
- DELETE rhnIndexerWork where object_type = 'snapshot_tag'
+ DELETE FROM rhnIndexerWork where object_type = 'snapshot_tag'
</delete>
<insert id="createLastSnapshotTag"
parameterClass="java.util.Map">
commit bb334cc207abd8be29c2ed22cb54371ae959580f
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Mon Feb 7 10:31:04 2011 +0100
added potgresql jdbc to rhn-search path
diff --git a/search-server/spacewalk-search/src/config/rhn-search b/search-server/spacewalk-search/src/config/rhn-search
index 3384280..5ffb659 100644
--- a/search-server/spacewalk-search/src/config/rhn-search
+++ b/search-server/spacewalk-search/src/config/rhn-search
@@ -75,8 +75,8 @@ unlock() {
}
removeindex() {
- JAVA_LIBRARY_PATH='-Djava.library.path=/usr/lib/oracle/11.2/client/lib:/usr/lib/oracle/11.2/client64/lib'
- SEARCH_CLASS_PATH=`build-classpath-directory /usr/share/rhn/search/lib /usr/share/java/ojdbc14.jar`
+ JAVA_LIBRARY_PATH='-Djava.library.path=/usr/lib/oracle/11.2/client/lib:/usr/lib/oracle/11.2/client64/lib:/usr/lib/gcj/postgresql-jdbc:/usr/lib64/gcj/postgresql-jdbc'
+ SEARCH_CLASS_PATH=`build-classpath-directory /usr/share/rhn/search/lib /usr/share/java/ojdbc14.jar /usr/share/java/postgresql-jdbc.jar`
CLASSPATH=/usr/share/rhn/search/classes:${SEARCH_CLASS_PATH} java $JAVA_LIBRARY_PATH com.redhat.satellite.search.DeleteIndexes
}
diff --git a/search-server/spacewalk-search/src/config/search/rhn_search_daemon.conf b/search-server/spacewalk-search/src/config/search/rhn_search_daemon.conf
index de49399..966d884 100644
--- a/search-server/spacewalk-search/src/config/search/rhn_search_daemon.conf
+++ b/search-server/spacewalk-search/src/config/search/rhn_search_daemon.conf
@@ -48,6 +48,8 @@ wrapper.java.library.path.1=/usr/lib
wrapper.java.library.path.2=/usr/lib64
wrapper.java.library.path.3=/usr/lib/oracle/11.2/client/lib
wrapper.java.library.path.4=/usr/lib/oracle/11.2/client64/lib
+wrapper.java.library.path.5=/usr/lib/gcj/postgresql-jdbc
+wrapper.java.library.path.6=/usr/lib64/gcj/postgresql-jdbc
# Java Additional Parameters
#wrapper.java.additional.1=
13 years, 4 months
4 commits - client/rhel client/tools
by Miroslav Suchý
client/rhel/rhnlib/rhn/rpclib.py | 34 ++++++++++++++++++
client/tools/osad/osad.spec | 2 -
client/tools/osad/src/osad.py | 31 ----------------
client/tools/rhncfg/config_client/rhncfgcli_verify.py | 2 -
client/tools/rhncfg/config_common/repository.py | 31 ----------------
client/tools/rhncfg/config_management/rhncfg_diff.py | 2 +
client/tools/rhncfg/rhncfg.spec | 2 -
client/tools/rhnpush/rhnpush.spec | 3 +
client/tools/rhnpush/uploadLib.py | 23 ++++--------
9 files changed, 51 insertions(+), 79 deletions(-)
New commits:
commit afaee2003f50a60eac424f74880c714d9a6a8f85
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Mon Feb 7 14:17:30 2011 +0100
628920 - older Satellites do not send selinux_ctx
Addressing:
Traceback (most recent call last):
File "/usr/bin/rhncfg-manager", line 46, in ?
sys.exit(Main().main() or 0)
File "/usr/share/rhn/config_common/rhn_main.py", line 187, in main
handler.run()
File "/usr/share/rhn/config_management/rhncfg_diff.py", line 107, in run
sys.stdout.write(
File "/usr/share/rhn/config_management/rhncfg_diff.py", line 154, in
diff_file
if not first_row and not self.__attributes_differ(info, local_info):
File "/usr/share/rhn/config_management/rhncfg_diff.py", line 114, in
__attributes_differ
return (fsrc['filemode'] != fdst['mode']) or \
KeyError: 'selinux_ctx'
and:
Traceback (most recent call last):
File "/usr/bin/rhncfg-manager", line 46, in ?
sys.exit(Main().main() or 0)
File "/usr/share/rhn/config_common/rhn_main.py", line 187, in main
handler.run()
File "/usr/share/rhn/config_management/rhncfg_diff.py", line 107, in run
sys.stdout.write(
File "/usr/share/rhn/config_management/rhncfg_diff.py", line 160, in
diff_file
first_row = template % (path, str(info['modified']),
ostr_to_sym(info['filemode'], info['filetype']),
KeyError: 'selinux_ctx'
diff --git a/client/tools/rhncfg/config_management/rhncfg_diff.py b/client/tools/rhncfg/config_management/rhncfg_diff.py
index 1c14210..e5191c7 100644
--- a/client/tools/rhncfg/config_management/rhncfg_diff.py
+++ b/client/tools/rhncfg/config_management/rhncfg_diff.py
@@ -147,6 +147,8 @@ class Handler(handler_base.HandlerBase):
# rhel4 do not support selinux
if not 'selinux_ctx' in local_info:
local_info['selinux_ctx'] = ''
+ if 'selinux_ctx' not in info:
+ info['selinux_ctx'] = ''
if not first_row and not self.__attributes_differ(info, local_info):
return ""
else:
commit 47bc1d697b10cc271cdd22b28caaeca8c7380d7b
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Mon Feb 7 14:03:13 2011 +0100
675164 - do not traceback if file do not differ
addressing:
Traceback (most recent call last):
File "/usr/bin/rhncfg-client", line 34, in ?
sys.exit(Main().main() or 0)
File "/usr/share/rhn/config_common/rhn_main.py", line 187, in main
handler.run()
File "/usr/share/rhn/config_client/rhncfgcli_verify.py", line 159, in run
maxlen = max(map(lambda x: len(x['status']), ret)) + 1
ValueError: max() arg is an empty sequence
diff --git a/client/tools/rhncfg/config_client/rhncfgcli_verify.py b/client/tools/rhncfg/config_client/rhncfgcli_verify.py
index 14a19a8..a86e1b7 100644
--- a/client/tools/rhncfg/config_client/rhncfgcli_verify.py
+++ b/client/tools/rhncfg/config_client/rhncfgcli_verify.py
@@ -156,7 +156,7 @@ class Handler(handler_base.HandlerBase):
#Not verbose, so give the simple output for each file...
else:
outstring = "%*s %s"
- maxlen = max(map(lambda x: len(x['status']), ret)) + 1
+ maxlen = max(0, map(lambda x: len(x['status']), ret)) + 1
for fdict in ret:
if self.options.only and len(fdict['status']) == 0:
continue
commit ed599e8af41c3ab0f38c8aed2d0b1e8298676f22
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Mon Feb 7 09:54:15 2011 +0100
Revert "Revert "get_server_capability() is defined twice in osad and rhncfg, merge and move to rhnlib and make it member of rpclib.Server""
This reverts commit f3be803b4b0b6545811268911d24288aff774d39.
diff --git a/client/rhel/rhnlib/rhn/rpclib.py b/client/rhel/rhnlib/rhn/rpclib.py
index 1f3b0c6..b2f4774 100644
--- a/client/rhel/rhnlib/rhn/rpclib.py
+++ b/client/rhel/rhnlib/rhn/rpclib.py
@@ -524,6 +524,40 @@ class Server:
self._transport.close()
self._transport = None
+ def get_server_capability(self):
+ """ Return dictionary of server capabilities.
+
+ It is in form of:
+ {{'registration.finish_message': {'version': '1', 'name': 'registration.finish_message', 'value': '1'}, ...}
+ """
+ headers = self.get_response_headers()
+ if headers is None:
+ # No request done yet
+ return {}
+ cap_headers = headers.getallmatchingheaders("X-RHN-Server-Capability")
+ if not cap_headers:
+ return {}
+ regexp = re.compile(
+ r"^(?P<name>[^(]*)\((?P<version>[^)]*)\)\s*=\s*(?P<value>.*)$")
+ vals = {}
+ for h in cap_headers:
+ arr = string.split(h, ':', 1)
+ assert len(arr) == 2
+ val = string.strip(arr[1])
+ if not val:
+ continue
+
+ mo = regexp.match(val)
+ if not mo:
+ # XXX Just ignoring it, for now
+ continue
+ vdict = mo.groupdict()
+ for k, v in vdict.items():
+ vdict[k] = string.strip(v)
+
+ vals[vdict['name']] = vdict
+ return vals
+
# RHN GET server
class GETServer(Server):
def __init__(self, uri, transport=None, proxy=None, username=None,
diff --git a/client/tools/osad/osad.spec b/client/tools/osad/osad.spec
index 5e6c9b4..28423a0 100644
--- a/client/tools/osad/osad.spec
+++ b/client/tools/osad/osad.spec
@@ -15,7 +15,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch: noarch
BuildRequires: python-devel
Requires: python
-Requires: rhnlib >= 1.8-3
+Requires: rhnlib >= 2.5.31
Requires: jabberpy
%if 0%{?rhel} <= 5
Requires: python-hashlib
diff --git a/client/tools/osad/src/osad.py b/client/tools/osad/src/osad.py
index 8e95f47..bd5fb9d 100644
--- a/client/tools/osad/src/osad.py
+++ b/client/tools/osad/src/osad.py
@@ -138,7 +138,7 @@ class Runner(jabber_lib.Runner):
s.add_trusted_cert(osa_ssl_cert)
s.registration.welcome_message()
- server_capabilities = get_server_capability(s)
+ server_capabilities = s.get_server_capability()
if not server_capabilities.has_key('registration.register_osad'):
die("Server does not support OSAD registration")
@@ -370,34 +370,5 @@ class OldUp2dateConfig:
def __getitem__(self, name):
return self._config_obj.readEntry(name)
-def get_server_capability(s):
- headers = s.get_response_headers()
- if headers is None:
- # No request done yet
- return {}
- cap_headers = headers.getallmatchingheaders("X-RHN-Server-Capability")
- if not cap_headers:
- return {}
- regexp = re.compile(
- r"^(?P<name>[^(]*)\((?P<version>[^)]*)\)\s*=\s*(?P<value>.*)$")
- vals = {}
- for h in cap_headers:
- arr = string.split(h, ':', 1)
- assert len(arr) == 2
- val = string.strip(arr[1])
- if not val:
- continue
-
- mo = regexp.match(val)
- if not mo:
- # XXX Just ignoring it, for now
- continue
- vdict = mo.groupdict()
- for k, v in vdict.items():
- vdict[k] = string.strip(v)
-
- vals[vdict['name']] = vdict
- return vals
-
if __name__ == '__main__':
sys.exit(main() or 0)
diff --git a/client/tools/rhncfg/config_common/repository.py b/client/tools/rhncfg/config_common/repository.py
index f11b45a..72dd92e 100644
--- a/client/tools/rhncfg/config_common/repository.py
+++ b/client/tools/rhncfg/config_common/repository.py
@@ -297,7 +297,7 @@ class RPC_Repository(Repository):
sys.stderr.write("XML-RPC error while talking to %s:\n %s\n" % (self.__server_url, e))
sys.exit(2)
- self._server_capabilities = get_server_capability(x_server)
+ self._server_capabilities = x_server.get_server_capability()
del x_server
# 6/29/05 wregglej 152388
@@ -392,32 +392,3 @@ class RPC_Repository(Repository):
params['file_contents'] = file_contents
return params
-
-def get_server_capability(s):
- headers = s.get_response_headers()
- if headers is None:
- # No request done yet
- return {}
- cap_headers = headers.getallmatchingheaders("X-RHN-Server-Capability")
- if not cap_headers:
- return {}
- regexp = re.compile(
- r"^(?P<name>[^(]*)\((?P<version>[^)]*)\)\s*=\s*(?P<value>.*)$")
- vals = {}
- for h in cap_headers:
- arr = string.split(h, ':', 1)
- assert len(arr) == 2
- val = string.strip(arr[1])
- if not val:
- continue
-
- mo = regexp.match(val)
- if not mo:
- # XXX Just ignoring it, for now
- continue
- vdict = mo.groupdict()
- for k, v in vdict.items():
- vdict[k] = string.strip(v)
-
- vals[vdict['name']] = vdict
- return vals
diff --git a/client/tools/rhncfg/rhncfg.spec b/client/tools/rhncfg/rhncfg.spec
index b5e8c6f..008c9fb 100644
--- a/client/tools/rhncfg/rhncfg.spec
+++ b/client/tools/rhncfg/rhncfg.spec
@@ -15,7 +15,7 @@ BuildArch: noarch
BuildRequires: docbook-utils
BuildRequires: python
Requires: python
-Requires: rhnlib
+Requires: rhnlib >= 2.5.32
# If this is rhel 4 or less we need up2date.
%if 0%{?rhel} && "%rhel" < "5"
Requires: up2date
diff --git a/client/tools/rhnpush/rhnpush.spec b/client/tools/rhnpush/rhnpush.spec
index 2186130..d66cb9d 100644
--- a/client/tools/rhnpush/rhnpush.spec
+++ b/client/tools/rhnpush/rhnpush.spec
@@ -10,7 +10,8 @@ Release: 1%{?dist}
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch: noarch
-Requires: rpm-python, rhnlib, rhncfg
+Requires: rpm-python
+Requires: rhnlib >= 2.5.32
Requires: spacewalk-backend-libs >= 0.8.3
%if 0%{?rhel} && 0%{?rhel} < 5
Requires: up2date
diff --git a/client/tools/rhnpush/uploadLib.py b/client/tools/rhnpush/uploadLib.py
index 7bc7e41..a69d0c4 100644
--- a/client/tools/rhnpush/uploadLib.py
+++ b/client/tools/rhnpush/uploadLib.py
@@ -25,8 +25,6 @@ import struct
import xmlrpclib
from spacewalk.common import rhn_mpm
from spacewalk.common.checksum import getFileChecksum
-from config_common.repository import get_server_capability
-
try:
from up2date_client import rhnserver
rhnserver_available = True
@@ -727,7 +725,7 @@ def exists_getPackageChecksumBySession(rpc_server):
server._server = rpc_server
result = server.capabilities.hasCapability('xmlrpc.packages.extended_profile', 2)
else: # rhel4 has no rhnserver
- server_capabilities = get_server_capability(rpc_server)
+ server_capabilities = rpc_server.get_server_capability()
if 'xmlrpc.packages.extended_profile' in server_capabilities:
# that capability can be '1' or '1-2', this is hackish
result = server_capabilities['xmlrpc.packages.extended_profile']['version'] > '1' and \
commit 8535f49f9356b7a00a952d5a6261245cc7833d0e
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Mon Feb 7 09:53:31 2011 +0100
Revert "Revert "648403 - do not create TB even on Red Hat Enterprise Linux 4""
This reverts commit b86ca4b9c50a83f489ab548d8a8abc66a6ad6a44.
diff --git a/client/tools/rhnpush/rhnpush.spec b/client/tools/rhnpush/rhnpush.spec
index 7dcb30d..2186130 100644
--- a/client/tools/rhnpush/rhnpush.spec
+++ b/client/tools/rhnpush/rhnpush.spec
@@ -10,7 +10,7 @@ Release: 1%{?dist}
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch: noarch
-Requires: rpm-python, rhnlib
+Requires: rpm-python, rhnlib, rhncfg
Requires: spacewalk-backend-libs >= 0.8.3
%if 0%{?rhel} && 0%{?rhel} < 5
Requires: up2date
diff --git a/client/tools/rhnpush/uploadLib.py b/client/tools/rhnpush/uploadLib.py
index a6e96ee..7bc7e41 100644
--- a/client/tools/rhnpush/uploadLib.py
+++ b/client/tools/rhnpush/uploadLib.py
@@ -15,6 +15,7 @@
# system imports
import os
+import re
import sys
import string
import fnmatch
@@ -24,6 +25,8 @@ import struct
import xmlrpclib
from spacewalk.common import rhn_mpm
from spacewalk.common.checksum import getFileChecksum
+from config_common.repository import get_server_capability
+
try:
from up2date_client import rhnserver
rhnserver_available = True
@@ -724,21 +727,13 @@ def exists_getPackageChecksumBySession(rpc_server):
server._server = rpc_server
result = server.capabilities.hasCapability('xmlrpc.packages.extended_profile', 2)
else: # rhel4 has no rhnserver
- result = True
- try: # if server do not have this function we will create TB :(
- raw_call(rpc_server.packages.getPackageChecksumBySession, '', {})
- except xmlrpclib.Fault, e:
- if e.faultCode in [-2, -33]:
- # Fault -33: session token is invalid
- # i.e. function exists but we supplied wrong data
- # Fault -2 session is unknown - expected when empty
- pass
- elif e.faultCode == -1:
- # Fault -1: function invalid
- result = False
- else:
- # pass through anything else
- raise
+ server_capabilities = get_server_capability(rpc_server)
+ if 'xmlrpc.packages.extended_profile' in server_capabilities:
+ # that capability can be '1' or '1-2', this is hackish
+ result = server_capabilities['xmlrpc.packages.extended_profile']['version'] > '1' and \
+ server_capabilities['xmlrpc.packages.extended_profile']['value'] # usually '1'
+ else:
+ result = False
return result
# compare two package [n,v,r,e] tuples
13 years, 4 months
Branch 'SPACEWALK-1.3' - java/code
by Jan Pazdziora
java/code/src/com/redhat/rhn/domain/channel/Channel.hbm.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit f2e7f2130737b042c99f20fcb82e3c46e3c7a2bc
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Mon Feb 7 14:07:55 2011 +0100
Fixing type (removing extra comma, left there by 3e8b50c53627391ff3e1ef5a46239724b0bcc6d6).
(cherry picked from commit 25a58f15e8e692a8653df53ba633acecf8804437)
diff --git a/java/code/src/com/redhat/rhn/domain/channel/Channel.hbm.xml b/java/code/src/com/redhat/rhn/domain/channel/Channel.hbm.xml
index 0bf1280..c8ff67a 100644
--- a/java/code/src/com/redhat/rhn/domain/channel/Channel.hbm.xml
+++ b/java/code/src/com/redhat/rhn/domain/channel/Channel.hbm.xml
@@ -241,7 +241,7 @@ PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN"
UNION
SELECT {c.*}
FROM rhnChannel c,
- rhnSharedChannelView sc,
+ rhnSharedChannelView sc
LEFT OUTER JOIN rhnChannelCloned c_1_ ON c.id = c_1_.id
WHERE sc.parent_channel = :cid
AND sc.org_trust_id = :org_id
13 years, 4 months
java/code
by Jan Pazdziora
java/code/src/com/redhat/rhn/domain/channel/Channel.hbm.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 25a58f15e8e692a8653df53ba633acecf8804437
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Mon Feb 7 14:07:55 2011 +0100
Fixing type (removing extra comma, left there by 3e8b50c53627391ff3e1ef5a46239724b0bcc6d6).
diff --git a/java/code/src/com/redhat/rhn/domain/channel/Channel.hbm.xml b/java/code/src/com/redhat/rhn/domain/channel/Channel.hbm.xml
index 0bf1280..c8ff67a 100644
--- a/java/code/src/com/redhat/rhn/domain/channel/Channel.hbm.xml
+++ b/java/code/src/com/redhat/rhn/domain/channel/Channel.hbm.xml
@@ -241,7 +241,7 @@ PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN"
UNION
SELECT {c.*}
FROM rhnChannel c,
- rhnSharedChannelView sc,
+ rhnSharedChannelView sc
LEFT OUTER JOIN rhnChannelCloned c_1_ ON c.id = c_1_.id
WHERE sc.parent_channel = :cid
AND sc.org_trust_id = :org_id
13 years, 4 months
Changes to 'refs/tags/osad-5.10.2-1'
by Tomas Lestach
Tag 'osad-5.10.2-1' created by Tomas Lestach <tlestach(a)redhat.com> at 2011-02-07 10:33 +0000
Tagging package [osad] version [5.10.2-1] in directory [client/tools/osad/].
Changes since spacewalk-backend-1.4.3-1:
Jan Pazdziora (2):
Explicitly require lsof in spacewalk-admin (for spacewalk-service).
The RHN::Utils::parametrize is not used anywhere, removing.
Michael Mraka (1):
675359 - modified attribute is not always present
Tomas Lestach (2):
do not check port 5222 on the client
Automatic commit of package [osad] release [5.10.2-1].
delouw (2):
l10n: Updates to German (de) translation
l10n: Updates to German (de) translation
---
backend/po/de.po | 102 +++++++++++++++++++----------
backend/server/configFilesHandler.py | 2
client/rhel/rhn-client-tools/po/de.po | 119 ++++++++++++++--------------------
client/tools/osad/osad.spec | 6 +
client/tools/osad/prog.init | 16 ++--
rel-eng/packages/osad | 2
spacewalk/admin/spacewalk-admin.spec | 1
spacewalk/admin/spacewalk-service | 4 -
web/modules/rhn/RHN/Utils.pm | 30 --------
9 files changed, 138 insertions(+), 144 deletions(-)
---
13 years, 4 months
2 commits - client/tools rel-eng/packages
by Tomas Lestach
client/tools/osad/osad.spec | 6 +++++-
client/tools/osad/prog.init | 16 +++++++++-------
rel-eng/packages/osad | 2 +-
3 files changed, 15 insertions(+), 9 deletions(-)
New commits:
commit 3bf416cd8e0e76f268cf05114acba9b9e61f9545
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Mon Feb 7 11:33:30 2011 +0100
Automatic commit of package [osad] release [5.10.2-1].
diff --git a/client/tools/osad/osad.spec b/client/tools/osad/osad.spec
index 05f3bfd..5e6c9b4 100644
--- a/client/tools/osad/osad.spec
+++ b/client/tools/osad/osad.spec
@@ -9,7 +9,7 @@ Group: System Environment/Daemons
License: GPLv2
URL: https://fedorahosted.org/spacewalk
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
-Version: 5.10.1
+Version: 5.10.2
Release: 1%{?dist}
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch: noarch
@@ -247,6 +247,9 @@ rpm -ql osa-dispatcher | xargs -n 1 /sbin/restorecon -rvi {}
# $Id$
%changelog
+* Mon Feb 07 2011 Tomas Lestach <tlestach(a)redhat.com> 5.10.2-1
+- do not check port 5222 on the client (tlestach(a)redhat.com)
+
* Thu Feb 03 2011 Tomas Lestach <tlestach(a)redhat.com> 5.10.1-1
- Bumping version to 5.10
diff --git a/rel-eng/packages/osad b/rel-eng/packages/osad
index 9e15924..1f522f0 100644
--- a/rel-eng/packages/osad
+++ b/rel-eng/packages/osad
@@ -1 +1 @@
-5.10.1-1 client/tools/osad/
+5.10.2-1 client/tools/osad/
commit 08e07ec6fbe55d126c3f456686baeb29f451e31e
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Mon Feb 7 10:58:36 2011 +0100
do not check port 5222 on the client
+ adding lsof Require for the server
diff --git a/client/tools/osad/osad.spec b/client/tools/osad/osad.spec
index c786962..05f3bfd 100644
--- a/client/tools/osad/osad.spec
+++ b/client/tools/osad/osad.spec
@@ -44,6 +44,7 @@ Summary: OSA dispatcher
Group: System Environment/Daemons
Requires: spacewalk-backend-server >= 1.2.32
Requires: jabberpy
+Requires: lsof
Conflicts: %{name} < %{version}-%{release}
Conflicts: %{name} > %{version}-%{release}
Requires(post): chkconfig
diff --git a/client/tools/osad/prog.init b/client/tools/osad/prog.init
index 5526a87..9005e33 100755
--- a/client/tools/osad/prog.init
+++ b/client/tools/osad/prog.init
@@ -37,13 +37,15 @@ script="/usr/sbin/@@PROG@@"
start() {
# Start daemon
echo -n "Starting $prog: "
- RETRIES=10
- while [ $RETRIES -gt 0 ]
- do
- lsof -t -i :5222 > /dev/null && break
- RETRIES=$((RETRIES-1))
- sleep 0.5
- done
+ if [ "$prog" == "osa-dispatcher" ]; then
+ RETRIES=10
+ while [ $RETRIES -gt 0 ]
+ do
+ lsof -t -i :5222 > /dev/null && break
+ RETRIES=$((RETRIES-1))
+ sleep 0.5
+ done
+ fi
daemon $script --pid-file /var/run/$prog.pid
RETVAL=$?
if [ $RETVAL -eq 0 ]; then echo_success; else echo_failure; fi
13 years, 4 months