Changes to 'refs/tags/spacewalk-backend-1.4.19-1'
by Miroslav Suchý
Tag 'spacewalk-backend-1.4.19-1' created by Miroslav Suchý <msuchy(a)redhat.com> at 2011-03-10 14:02 +0000
Tagging package [spacewalk-backend] version [1.4.19-1] in directory [backend/].
Changes since spacewalk-utils-1.4.2-1:
Jan Pazdziora (1):
Subquery in FROM must have an alias in PostgreSQL.
Michael Mraka (2):
replaced (+) with ansi left join - made ompare files work on postgresql
posgtresql can't lock only one column
Miroslav Suchý (3):
683546 - optparse isn't friendly to translations in unicode
move server.mo from /usr/share/rhn/ to /usr/share/locale and rename it to spacewalk-backend-server
Automatic commit of package [spacewalk-backend] release [1.4.19-1].
---
backend/common/rhnTranslate.py | 2 -
backend/po/Makefile | 5 ++-
backend/satellite_tools/disk_dumper/iss.py | 3 +-
backend/satellite_tools/satsync.py | 3 +-
backend/server/action/configfiles.py | 10 +++---
backend/server/action_extra_data/configfiles.py | 2 -
backend/spacewalk-backend.spec | 15 +++++++---
client/rhel/rhn-client-tools/src/bin/rhn-profile-sync.py | 3 +-
client/rhel/rhn-client-tools/src/bin/rhn_register.py | 3 +-
client/rhel/rhn-client-tools/src/bin/rhnreg_ks.py | 3 +-
client/rhel/rhn-client-tools/src/bin/spacewalk-channel.py | 4 +-
client/rhel/rhn-client-tools/src/firstboot-legacy-rhel5/rhn_choose_server_gui.py | 4 +-
client/rhel/rhn-client-tools/src/firstboot-legacy-rhel5/rhn_create_profile_gui.py | 4 +-
client/rhel/rhn-client-tools/src/firstboot-legacy-rhel5/rhn_finish_gui.py | 5 +--
client/rhel/rhn-client-tools/src/firstboot-legacy-rhel5/rhn_login_gui.py | 9 +-----
client/rhel/rhn-client-tools/src/firstboot-legacy-rhel5/rhn_provide_certificate_gui.py | 5 +--
client/rhel/rhn-client-tools/src/firstboot-legacy-rhel5/rhn_review_gui.py | 5 +--
client/rhel/rhn-client-tools/src/firstboot-legacy-rhel5/rhn_start_gui.py | 5 +--
client/rhel/rhn-client-tools/src/up2date_client/capabilities.py | 3 +-
client/rhel/rhn-client-tools/src/up2date_client/config.py | 3 +-
client/rhel/rhn-client-tools/src/up2date_client/gui.py | 3 +-
client/rhel/rhn-client-tools/src/up2date_client/hardware.py | 3 +-
client/rhel/rhn-client-tools/src/up2date_client/messageWindow.py | 3 +-
client/rhel/rhn-client-tools/src/up2date_client/rhnChannel.py | 6 +---
client/rhel/rhn-client-tools/src/up2date_client/rhncli.py | 4 +-
client/rhel/rhn-client-tools/src/up2date_client/rhnreg.py | 4 +-
client/rhel/rhn-client-tools/src/up2date_client/rhnregGui.py | 4 +-
client/rhel/rhn-client-tools/src/up2date_client/rhnreg_constants.py | 3 +-
client/rhel/rhn-client-tools/src/up2date_client/rpcServer.py | 4 +-
client/rhel/rhn-client-tools/src/up2date_client/rpmUtils.py | 4 +-
client/rhel/rhn-client-tools/src/up2date_client/tui.py | 4 +-
client/rhel/rhn-client-tools/src/up2date_client/up2dateErrors.py | 3 +-
client/rhel/rhn-client-tools/src/up2date_client/up2dateUtils.py | 6 +---
client/rhel/yum-rhn-plugin/rhnplugin.py | 3 +-
client/tools/rhn-virtualization/virtualization/poller.py | 4 +-
client/tools/rhn-virtualization/virtualization/support.py | 5 +--
java/code/src/com/redhat/rhn/common/db/datasource/xml/Package_queries.xml | 8 ++---
rel-eng/packages/spacewalk-backend | 2 -
38 files changed, 88 insertions(+), 81 deletions(-)
---
13 years, 2 months
Changes to 'refs/tags/rhn-client-tools-1.4.4-1'
by Miroslav Suchý
Tag 'rhn-client-tools-1.4.4-1' created by Miroslav Suchý <msuchy(a)redhat.com> at 2011-03-10 14:03 +0000
Tagging package [rhn-client-tools] version [1.4.4-1] in directory [client/rhel/rhn-client-tools/].
Changes since spacewalk-utils-1.4.2-1:
Jan Pazdziora (1):
Subquery in FROM must have an alias in PostgreSQL.
Michael Mraka (2):
replaced (+) with ansi left join - made ompare files work on postgresql
posgtresql can't lock only one column
Miroslav Suchý (4):
683546 - optparse isn't friendly to translations in unicode
move server.mo from /usr/share/rhn/ to /usr/share/locale and rename it to spacewalk-backend-server
Automatic commit of package [spacewalk-backend] release [1.4.19-1].
Automatic commit of package [rhn-client-tools] release [1.4.4-1].
---
backend/common/rhnTranslate.py | 2 -
backend/po/Makefile | 5 ++-
backend/satellite_tools/disk_dumper/iss.py | 3 +-
backend/satellite_tools/satsync.py | 3 +-
backend/server/action/configfiles.py | 10 +++---
backend/server/action_extra_data/configfiles.py | 2 -
backend/spacewalk-backend.spec | 15 +++++++---
client/rhel/rhn-client-tools/rhn-client-tools.spec | 7 ++++
client/rhel/rhn-client-tools/src/bin/rhn-profile-sync.py | 3 +-
client/rhel/rhn-client-tools/src/bin/rhn_register.py | 3 +-
client/rhel/rhn-client-tools/src/bin/rhnreg_ks.py | 3 +-
client/rhel/rhn-client-tools/src/bin/spacewalk-channel.py | 4 +-
client/rhel/rhn-client-tools/src/firstboot-legacy-rhel5/rhn_choose_server_gui.py | 4 +-
client/rhel/rhn-client-tools/src/firstboot-legacy-rhel5/rhn_create_profile_gui.py | 4 +-
client/rhel/rhn-client-tools/src/firstboot-legacy-rhel5/rhn_finish_gui.py | 5 +--
client/rhel/rhn-client-tools/src/firstboot-legacy-rhel5/rhn_login_gui.py | 9 +-----
client/rhel/rhn-client-tools/src/firstboot-legacy-rhel5/rhn_provide_certificate_gui.py | 5 +--
client/rhel/rhn-client-tools/src/firstboot-legacy-rhel5/rhn_review_gui.py | 5 +--
client/rhel/rhn-client-tools/src/firstboot-legacy-rhel5/rhn_start_gui.py | 5 +--
client/rhel/rhn-client-tools/src/up2date_client/capabilities.py | 3 +-
client/rhel/rhn-client-tools/src/up2date_client/config.py | 3 +-
client/rhel/rhn-client-tools/src/up2date_client/gui.py | 3 +-
client/rhel/rhn-client-tools/src/up2date_client/hardware.py | 3 +-
client/rhel/rhn-client-tools/src/up2date_client/messageWindow.py | 3 +-
client/rhel/rhn-client-tools/src/up2date_client/rhnChannel.py | 6 +---
client/rhel/rhn-client-tools/src/up2date_client/rhncli.py | 4 +-
client/rhel/rhn-client-tools/src/up2date_client/rhnreg.py | 4 +-
client/rhel/rhn-client-tools/src/up2date_client/rhnregGui.py | 4 +-
client/rhel/rhn-client-tools/src/up2date_client/rhnreg_constants.py | 3 +-
client/rhel/rhn-client-tools/src/up2date_client/rpcServer.py | 4 +-
client/rhel/rhn-client-tools/src/up2date_client/rpmUtils.py | 4 +-
client/rhel/rhn-client-tools/src/up2date_client/tui.py | 4 +-
client/rhel/rhn-client-tools/src/up2date_client/up2dateErrors.py | 3 +-
client/rhel/rhn-client-tools/src/up2date_client/up2dateUtils.py | 6 +---
client/rhel/yum-rhn-plugin/rhnplugin.py | 3 +-
client/tools/rhn-virtualization/virtualization/poller.py | 4 +-
client/tools/rhn-virtualization/virtualization/support.py | 5 +--
java/code/src/com/redhat/rhn/common/db/datasource/xml/Package_queries.xml | 8 ++---
rel-eng/packages/rhn-client-tools | 2 -
rel-eng/packages/spacewalk-backend | 2 -
40 files changed, 95 insertions(+), 83 deletions(-)
---
13 years, 2 months
2 commits - backend/spacewalk-backend.spec client/rhel rel-eng/packages
by Miroslav Suchý
backend/spacewalk-backend.spec | 10 +++++++++-
client/rhel/rhn-client-tools/rhn-client-tools.spec | 7 ++++++-
rel-eng/packages/rhn-client-tools | 2 +-
rel-eng/packages/spacewalk-backend | 2 +-
4 files changed, 17 insertions(+), 4 deletions(-)
New commits:
commit 338a45bd243e2b4564f3c3133afb063cf2f296e9
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Thu Mar 10 15:03:17 2011 +0100
Automatic commit of package [rhn-client-tools] release [1.4.4-1].
diff --git a/client/rhel/rhn-client-tools/rhn-client-tools.spec b/client/rhel/rhn-client-tools/rhn-client-tools.spec
index 5078ce8..ae940cb 100644
--- a/client/rhel/rhn-client-tools/rhn-client-tools.spec
+++ b/client/rhel/rhn-client-tools/rhn-client-tools.spec
@@ -4,7 +4,7 @@ Group: System Environment/Base
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
URL: https://fedorahosted.org/spacewalk
Name: rhn-client-tools
-Version: 1.4.3
+Version: 1.4.4
Release: 1%{?dist}
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch: noarch
@@ -292,6 +292,11 @@ make -f Makefile.rhn-client-tools test
%endif
%changelog
+* Thu Mar 10 2011 Miroslav Suchý <msuchy(a)redhat.com> 1.4.4-1
+- 683546 - optparse isn't friendly to translations in unicode
+- update .po files
+- 679217 - mention subscription manager as alternative to rhn_register
+
* Tue Mar 01 2011 Miroslav Suchý <msuchy(a)redhat.com> 1.4.3-1
- Revert "provide path to puplet-screenshot.png" (msuchy(a)redhat.com)
- 666860 - remove glade warnings (msuchy(a)redhat.com)
diff --git a/rel-eng/packages/rhn-client-tools b/rel-eng/packages/rhn-client-tools
index 26715d1..de5541d 100644
--- a/rel-eng/packages/rhn-client-tools
+++ b/rel-eng/packages/rhn-client-tools
@@ -1 +1 @@
-1.4.3-1 client/rhel/rhn-client-tools/
+1.4.4-1 client/rhel/rhn-client-tools/
commit 619101a0d0eba31c2cf46a4672afacd44310a07a
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Thu Mar 10 15:02:45 2011 +0100
Automatic commit of package [spacewalk-backend] release [1.4.19-1].
diff --git a/backend/spacewalk-backend.spec b/backend/spacewalk-backend.spec
index 7905bb3..15f1e26 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.18
+Version: 1.4.19
Release: 1%{?dist}
URL: https://fedorahosted.org/spacewalk
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
@@ -684,6 +684,14 @@ rm -f %{rhnconf}/rhnSecret.py*
# $Id$
%changelog
+* Thu Mar 10 2011 Miroslav Suchý <msuchy(a)redhat.com> 1.4.19-1
+- move server.mo from /usr/share/rhn/ to /usr/share/locale and rename it to
+ spacewalk-backend-server
+- posgtresql can't lock only one column
+- replaced (+) with ansi left join - made ompare files work on postgresql
+- 683546 - optparse isn't friendly to translations in unicode
+- The file attribute has been renamed to filename
+
* Tue Mar 08 2011 Michael Mraka <michael.mraka(a)redhat.com> 1.4.18-1
- Fixed postgresql error in osad
diff --git a/rel-eng/packages/spacewalk-backend b/rel-eng/packages/spacewalk-backend
index 7612b2b..a93a7ab 100644
--- a/rel-eng/packages/spacewalk-backend
+++ b/rel-eng/packages/spacewalk-backend
@@ -1 +1 @@
-1.4.18-1 backend/
+1.4.19-1 backend/
13 years, 2 months
backend/common backend/po backend/spacewalk-backend.spec
by Miroslav Suchý
backend/common/rhnTranslate.py | 2 +-
backend/po/Makefile | 5 +++--
backend/spacewalk-backend.spec | 5 ++---
3 files changed, 6 insertions(+), 6 deletions(-)
New commits:
commit bc5ba7caf7e5424aaf44272367e99068d7af4b6e
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Thu Mar 10 14:24:12 2011 +0100
move server.mo from /usr/share/rhn/ to /usr/share/locale and rename it to spacewalk-backend-server
diff --git a/backend/common/rhnTranslate.py b/backend/common/rhnTranslate.py
index f93062f..c8fbffe 100644
--- a/backend/common/rhnTranslate.py
+++ b/backend/common/rhnTranslate.py
@@ -46,7 +46,7 @@ class RHN_Translations(gettext.GNUTranslations):
class i18n:
_default_langs = ['en', 'en_US', 'C']
# Wrapper class that allows us to change languages
- def __init__(self, domain=None, localedir="/usr/share/rhn/locale"):
+ def __init__(self, domain=None, localedir="/usr/share/locale"):
self.domain = domain
self.localedir = localedir
self.langs = self._default_langs[:]
diff --git a/backend/po/Makefile b/backend/po/Makefile
index a4317d7..728e908 100644
--- a/backend/po/Makefile
+++ b/backend/po/Makefile
@@ -4,11 +4,12 @@
TOP = ..
SUBDIR = locale
+localedir = $(PREFIX)/usr/share/locale
include $(TOP)/Makefile.defs
# What is this package?
-NLSPACKAGE = server
+NLSPACKAGE = spacewalk-backend-server
POTFILE = $(NLSPACKAGE).pot
# PO catalog handling
@@ -55,7 +56,7 @@ clean ::
install :: $(MOFILES)
@for n in $(MOFILES); do \
l=`basename $$n .mo`; \
- d="$(PREFIX)$(INSTALL_DEST)/$$l/LC_MESSAGES" ; \
+ d="$(PREFIX)$(localedir)/$$l/LC_MESSAGES" ; \
$(INSTALL_DIR) $$d ; \
$(INSTALL_DATA) $$n $$d/$(NLSPACKAGE).mo ; \
done
diff --git a/backend/spacewalk-backend.spec b/backend/spacewalk-backend.spec
index 2d35618..7905bb3 100644
--- a/backend/spacewalk-backend.spec
+++ b/backend/spacewalk-backend.spec
@@ -297,6 +297,7 @@ rm -rfv $RPM_BUILD_ROOT/%{rhnroot}/wsgi
rm -v $RPM_BUILD_ROOT/%{apacheconfd}/zz-spacewalk-server-python.conf
%endif
+%find_lang %{name}-server
%clean
rm -rf $RPM_BUILD_ROOT
@@ -394,7 +395,7 @@ rm -f %{rhnconf}/rhnSecret.py*
%doc PYTHON-LICENSES.txt LICENSE
%{pythonrhnroot}/server/rhnSQL/driver_postgresql.py*
-%files server
+%files server -f %{name}-server.lang
%defattr(-,root,root)
%doc PYTHON-LICENSES.txt LICENSE
# modules
@@ -476,8 +477,6 @@ rm -f %{rhnconf}/rhnSecret.py*
# logs and other stuff
%config(noreplace) %{_sysconfdir}/logrotate.d/spacewalk-backend-server
-# translations
-%{rhnroot}/locale
%files xmlrpc
%defattr(-,root,root)
13 years, 2 months
java/code
by Jan Pazdziora
java/code/src/com/redhat/rhn/common/db/datasource/xml/Package_queries.xml | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
New commits:
commit 3e7398371a0222ac9c93b63f47a7d48aac8e934a
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Thu Mar 10 14:11:29 2011 +0100
Subquery in FROM must have an alias in PostgreSQL.
Addressing
Caused by: com.redhat.rhn.common.db.WrappedSQLException: ERROR: subquery in FROM must have an alias
Hint: For example, FROM (SELECT ...) [AS] foo.
Position: 59
at com.redhat.rhn.common.translation.SqlExceptionTranslator.postgreSqlException(SqlExceptionTranslator.java:56)
at com.redhat.rhn.common.translation.SqlExceptionTranslator.sqlException(SqlExceptionTranslator.java:45)
at com.redhat.rhn.common.db.NamedPreparedStatement.execute(NamedPreparedStatement.java:141)
at com.redhat.rhn.common.db.datasource.CachedStatement.execute(CachedStatement.java:453)
at com.redhat.rhn.common.db.datasource.CachedStatement.execute(CachedStatement.java:430)
at com.redhat.rhn.common.db.datasource.CachedStatement.execute(CachedStatement.java:336)
at com.redhat.rhn.common.db.datasource.CachedStatement.execute(CachedStatement.java:289)
at com.redhat.rhn.common.db.datasource.SelectMode.execute(SelectMode.java:142)
at com.redhat.rhn.manager.rhnpackage.PackageManager.lookupPackageNameOverview(PackageManager.java:793)
at com.redhat.rhn.frontend.action.channel.PackageNameOverviewAction.execute(PackageNameOverviewAction.java:75)
at org.apache.struts.action.RequestProcessor.processActionPerform(RequestProcessor.java:425)
... 40 more
diff --git a/java/code/src/com/redhat/rhn/common/db/datasource/xml/Package_queries.xml b/java/code/src/com/redhat/rhn/common/db/datasource/xml/Package_queries.xml
index 88948a3..53bbd39 100644
--- a/java/code/src/com/redhat/rhn/common/db/datasource/xml/Package_queries.xml
+++ b/java/code/src/com/redhat/rhn/common/db/datasource/xml/Package_queries.xml
@@ -1478,7 +1478,7 @@ SELECT NVREA, PACKAGE_ID, CHANNEL_NAME, CHANNEL_ID
AND P.id = CP.package_id
AND C.id = AC.channel_id
AND PA.id = P.package_arch_id
- )
+ ) X
ORDER BY CHANNEL_NAME DESC, EVR DESC
</query>
@@ -1514,7 +1514,7 @@ SELECT NVREA, PACKAGE_ID, CHANNEL_NAME, CHANNEL_ID
AND P.id = CP.package_id
AND C.id = AC.channel_id
AND PA.id = P.package_arch_id
- )
+ ) X
ORDER BY CHANNEL_NAME DESC, EVR DESC
</query>
</mode>
@@ -1549,7 +1549,7 @@ SELECT NVREA, PACKAGE_ID, CHANNEL_NAME, CHANNEL_ID
AND P.id = CP.package_id
AND C.id = AC.channel_id
AND PA.id = P.package_arch_id
- )
+ ) X
ORDER BY CHANNEL_NAME DESC, EVR DESC
</query>
</mode>
@@ -1584,7 +1584,7 @@ SELECT NVREA, PACKAGE_ID, CHANNEL_NAME, CHANNEL_ID
AND P.id = CP.package_id
AND C.id = AC.channel_id
AND PA.id = P.package_arch_id
- )
+ ) X
ORDER BY CHANNEL_NAME DESC, EVR DESC
</query>
</mode>
13 years, 2 months
2 commits - backend/server
by Michael Mraka
backend/server/action/configfiles.py | 10 +++++-----
backend/server/action_extra_data/configfiles.py | 2 +-
2 files changed, 6 insertions(+), 6 deletions(-)
New commits:
commit 384986eb0374c8a8312c24f0881d4e27127cc434
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Thu Mar 10 14:27:03 2011 +0100
posgtresql can't lock only one column
fixing
ERROR: relation "result" in FOR UPDATE/SHARE clause not found in FROM
clause at character 117
diff --git a/backend/server/action_extra_data/configfiles.py b/backend/server/action_extra_data/configfiles.py
index 577d3db..1f95a3e 100644
--- a/backend/server/action_extra_data/configfiles.py
+++ b/backend/server/action_extra_data/configfiles.py
@@ -269,7 +269,7 @@ _query_add_result_diff = rhnSQL.Statement("""
_query_update_result = rhnSQL.Statement("""
select result from rhnActionConfigRevisionResult
where action_config_revision_id = :action_config_revision_id
- for update of result
+ for update
""")
def _add_result(action_config_revision_id, diff):
commit 63d0c497a1df9246b9e036c7f778ae117b9c517c
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Thu Mar 10 14:15:36 2011 +0100
replaced (+) with ansi left join - made ompare files work on postgresql
diff --git a/backend/server/action/configfiles.py b/backend/server/action/configfiles.py
index 61a777d..a6530fe 100644
--- a/backend/server/action/configfiles.py
+++ b/backend/server/action/configfiles.py
@@ -131,13 +131,15 @@ _query_get_files = rhnSQL.Statement("""
end as symlink
from
rhnConfigFileState cfs,
- rhnConfigContent ccont,
- rhnChecksumView c,
rhnConfigChannel cc,
rhnConfigFileName cfn,
rhnConfigInfo ci,
rhnConfigFile cf,
- rhnConfigRevision cr,
+ rhnConfigRevision cr
+ left join rhnConfigContent ccont
+ on cr.config_content_id = ccont.id
+ left join rhnChecksumView c
+ on ccont.checksum_id = c.id,
rhnConfigFileType cft,
rhnActionConfigRevision acr
where acr.server_id = :server_id
@@ -149,9 +151,7 @@ _query_get_files = rhnSQL.Statement("""
and cf.config_channel_id = cc.id
and cf.state_id = cfs.id
and cfs.label = 'alive'
- and cr.config_content_id = ccont.id (+)
and cr.config_file_type_id = cft.id
- and ccont.checksum_id = c.id(+)
""")
def _get_files(server_id, action_id):
13 years, 2 months
backend/satellite_tools client/rhel client/tools
by Miroslav Suchý
backend/satellite_tools/disk_dumper/iss.py | 3 ++-
backend/satellite_tools/satsync.py | 3 ++-
client/rhel/rhn-client-tools/src/bin/rhn-profile-sync.py | 3 ++-
client/rhel/rhn-client-tools/src/bin/rhn_register.py | 3 ++-
client/rhel/rhn-client-tools/src/bin/rhnreg_ks.py | 3 ++-
client/rhel/rhn-client-tools/src/bin/spacewalk-channel.py | 4 ++--
client/rhel/rhn-client-tools/src/firstboot-legacy-rhel5/rhn_choose_server_gui.py | 4 ++--
client/rhel/rhn-client-tools/src/firstboot-legacy-rhel5/rhn_create_profile_gui.py | 4 ++--
client/rhel/rhn-client-tools/src/firstboot-legacy-rhel5/rhn_finish_gui.py | 5 ++---
client/rhel/rhn-client-tools/src/firstboot-legacy-rhel5/rhn_login_gui.py | 9 ++-------
client/rhel/rhn-client-tools/src/firstboot-legacy-rhel5/rhn_provide_certificate_gui.py | 5 ++---
client/rhel/rhn-client-tools/src/firstboot-legacy-rhel5/rhn_review_gui.py | 5 ++---
client/rhel/rhn-client-tools/src/firstboot-legacy-rhel5/rhn_start_gui.py | 5 ++---
client/rhel/rhn-client-tools/src/up2date_client/capabilities.py | 3 ++-
client/rhel/rhn-client-tools/src/up2date_client/config.py | 3 ++-
client/rhel/rhn-client-tools/src/up2date_client/gui.py | 3 ++-
client/rhel/rhn-client-tools/src/up2date_client/hardware.py | 3 ++-
client/rhel/rhn-client-tools/src/up2date_client/messageWindow.py | 3 ++-
client/rhel/rhn-client-tools/src/up2date_client/rhnChannel.py | 6 ++----
client/rhel/rhn-client-tools/src/up2date_client/rhncli.py | 4 ++--
client/rhel/rhn-client-tools/src/up2date_client/rhnreg.py | 4 ++--
client/rhel/rhn-client-tools/src/up2date_client/rhnregGui.py | 4 ++--
client/rhel/rhn-client-tools/src/up2date_client/rhnreg_constants.py | 3 ++-
client/rhel/rhn-client-tools/src/up2date_client/rpcServer.py | 4 ++--
client/rhel/rhn-client-tools/src/up2date_client/rpmUtils.py | 4 ++--
client/rhel/rhn-client-tools/src/up2date_client/tui.py | 4 ++--
client/rhel/rhn-client-tools/src/up2date_client/up2dateErrors.py | 3 ++-
client/rhel/rhn-client-tools/src/up2date_client/up2dateUtils.py | 6 ++----
client/rhel/yum-rhn-plugin/rhnplugin.py | 3 ++-
client/tools/rhn-virtualization/virtualization/poller.py | 4 ++--
client/tools/rhn-virtualization/virtualization/support.py | 5 ++---
31 files changed, 62 insertions(+), 63 deletions(-)
New commits:
commit ceb71f81a3b64d8a71781f65f9d82b88340601e8
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Thu Mar 10 14:02:42 2011 +0100
683546 - optparse isn't friendly to translations in unicode
addressing:
d64:~ # export LANG=de_DE.UTF-8
d64:~ # rhnreg_ks --help
Ein Fehler trat auf:
<type 'exceptions.UnicodeDecodeError'>
Siehe /var/log/up2date für weitere Informationen
/var/log/up2date:
[Mon Jan 17 11:51:00 2011] up2date
Traceback (most recent call last):
File "/usr/sbin/rhnreg_ks", line 205, in <module>
cli.run()
File "rhncli.py", line 73, in run
File "rhncli.py", line 112, in initialize
File "/usr/lib64/python2.6/optparse.py", line 1378, in parse_args
stop = self._process_args(largs, rargs, values)
File "/usr/lib64/python2.6/optparse.py", line 1418, in _process_args
self._process_long_opt(rargs, values)
File "/usr/lib64/python2.6/optparse.py", line 1493, in _process_long_opt
option.process(opt, value, values, self)
File "/usr/lib64/python2.6/optparse.py", line 782, in process
self.action, self.dest, opt, value, values, parser)
File "/usr/lib64/python2.6/optparse.py", line 804, in take_action
parser.print_help()
File "/usr/lib64/python2.6/optparse.py", line 1648, in print_help
file.write(self.format_help().encode(encoding, "replace"))
<type 'exceptions.UnicodeDecodeError'>: 'ascii' codec can't decode byte 0xc3 in
position 781: ordinal not in range(128)
diff --git a/backend/satellite_tools/disk_dumper/iss.py b/backend/satellite_tools/disk_dumper/iss.py
index 06ef7da..0cd6e44 100644
--- a/backend/satellite_tools/disk_dumper/iss.py
+++ b/backend/satellite_tools/disk_dumper/iss.py
@@ -33,7 +33,8 @@ import iss_isos
from spacewalk.common.checksum import getFileChecksum
import gettext
-_ = gettext.gettext
+t = gettext.translation('spacewalk-backend-server', fallback=True)
+_ = t.ugettext
class ISSError(Exception):
def __init__(self, msg, tb):
diff --git a/backend/satellite_tools/satsync.py b/backend/satellite_tools/satsync.py
index 39fed19..1506242 100644
--- a/backend/satellite_tools/satsync.py
+++ b/backend/satellite_tools/satsync.py
@@ -29,7 +29,8 @@ import locale
from optparse import Option, OptionParser
import gettext
-_ = gettext.gettext
+t = gettext.translation('spacewalk-backend-server', fallback=True)
+_ = t.ugettext
# __rhn imports__
from spacewalk.common import CFG, initCFG, initLOG, exitWithTraceback, rhnMail, \
diff --git a/client/rhel/rhn-client-tools/src/bin/rhn-profile-sync.py b/client/rhel/rhn-client-tools/src/bin/rhn-profile-sync.py
index 2ed2dcb..ee8f8e9 100644
--- a/client/rhel/rhn-client-tools/src/bin/rhn-profile-sync.py
+++ b/client/rhel/rhn-client-tools/src/bin/rhn-profile-sync.py
@@ -12,7 +12,8 @@
import sys
import gettext
-_ = gettext.gettext
+t = gettext.translation('rhn-client-tools', fallback=True)
+_ = t.ugettext
sys.path.append("/usr/share/rhn/")
diff --git a/client/rhel/rhn-client-tools/src/bin/rhn_register.py b/client/rhel/rhn-client-tools/src/bin/rhn_register.py
index 7116dfd..568d82c 100644
--- a/client/rhel/rhn-client-tools/src/bin/rhn_register.py
+++ b/client/rhel/rhn-client-tools/src/bin/rhn_register.py
@@ -14,7 +14,8 @@ import sys
import os
import gettext
-_ = gettext.gettext
+t = gettext.translation('rhn-client-tools', fallback=True)
+_ = t.ugettext
sys.path.append("/usr/share/rhn/")
diff --git a/client/rhel/rhn-client-tools/src/bin/rhnreg_ks.py b/client/rhel/rhn-client-tools/src/bin/rhnreg_ks.py
index e1b6c4d..072f69b 100755
--- a/client/rhel/rhn-client-tools/src/bin/rhnreg_ks.py
+++ b/client/rhel/rhn-client-tools/src/bin/rhnreg_ks.py
@@ -24,7 +24,8 @@ import sys
import os
import gettext
-_ = gettext.gettext
+t = gettext.translation('rhn-client-tools', fallback=True)
+_ = t.ugettext
sys.path.append("/usr/share/rhn/")
diff --git a/client/rhel/rhn-client-tools/src/bin/spacewalk-channel.py b/client/rhel/rhn-client-tools/src/bin/spacewalk-channel.py
index b798b4f..f1b1cde 100644
--- a/client/rhel/rhn-client-tools/src/bin/spacewalk-channel.py
+++ b/client/rhel/rhn-client-tools/src/bin/spacewalk-channel.py
@@ -25,8 +25,8 @@ from rhn import rpclib
from optparse import Option, OptionParser
import gettext
-_ = gettext.gettext
-gettext.textdomain("rhn-client-tools")
+t = gettext.translation('rhn-client-tools', fallback=True)
+_ = t.ugettext
def systemExit(code, msgs=None):
"Exit with a code and optional message(s). Saved a few lines of code."
diff --git a/client/rhel/rhn-client-tools/src/firstboot-legacy-rhel5/rhn_choose_server_gui.py b/client/rhel/rhn-client-tools/src/firstboot-legacy-rhel5/rhn_choose_server_gui.py
index 83f88ab..7865c2b 100644
--- a/client/rhel/rhn-client-tools/src/firstboot-legacy-rhel5/rhn_choose_server_gui.py
+++ b/client/rhel/rhn-client-tools/src/firstboot-legacy-rhel5/rhn_choose_server_gui.py
@@ -29,9 +29,9 @@ from rhn_register_firstboot_gui_window import RhnRegisterFirstbootGuiWindow
import gtk
from gtk import glade
import gettext
-_ = gettext.gettext
+t = gettext.translation('rhn-client-tools', fallback=True)
+_ = t.ugettext
-gettext.textdomain("rhn-client-tools")
gtk.glade.bindtextdomain("rhn-client-tools")
diff --git a/client/rhel/rhn-client-tools/src/firstboot-legacy-rhel5/rhn_create_profile_gui.py b/client/rhel/rhn-client-tools/src/firstboot-legacy-rhel5/rhn_create_profile_gui.py
index e49b520..d35218c 100644
--- a/client/rhel/rhn-client-tools/src/firstboot-legacy-rhel5/rhn_create_profile_gui.py
+++ b/client/rhel/rhn-client-tools/src/firstboot-legacy-rhel5/rhn_create_profile_gui.py
@@ -37,8 +37,8 @@ import up2dateErrors
import messageWindow
import gettext
-_ = gettext.gettext
-gettext.textdomain("rhn-client-tools")
+t = gettext.translation('rhn-client-tools', fallback=True)
+_ = t.ugettext
gtk.glade.bindtextdomain("rhn-client-tools")
diff --git a/client/rhel/rhn-client-tools/src/firstboot-legacy-rhel5/rhn_finish_gui.py b/client/rhel/rhn-client-tools/src/firstboot-legacy-rhel5/rhn_finish_gui.py
index fa4c6ce..ef22afe 100644
--- a/client/rhel/rhn-client-tools/src/firstboot-legacy-rhel5/rhn_finish_gui.py
+++ b/client/rhel/rhn-client-tools/src/firstboot-legacy-rhel5/rhn_finish_gui.py
@@ -28,9 +28,8 @@ import config
import gtk
from gtk import glade
import gettext
-_ = gettext.gettext
-
-gettext.textdomain("rhn-client-tools")
+t = gettext.translation('rhn-client-tools', fallback=True)
+_ = t.ugettext
gtk.glade.bindtextdomain("rhn-client-tools")
diff --git a/client/rhel/rhn-client-tools/src/firstboot-legacy-rhel5/rhn_login_gui.py b/client/rhel/rhn-client-tools/src/firstboot-legacy-rhel5/rhn_login_gui.py
index 7bd11b0..267c44c 100644
--- a/client/rhel/rhn-client-tools/src/firstboot-legacy-rhel5/rhn_login_gui.py
+++ b/client/rhel/rhn-client-tools/src/firstboot-legacy-rhel5/rhn_login_gui.py
@@ -34,14 +34,9 @@ sys.path.insert(1,"/usr/share/rhn")
import rhnreg
import rhnregGui
-
-##
-## I18N
-##
import gettext
-_ = gettext.gettext
-
-gettext.textdomain("rhn-client-tools")
+t = gettext.translation('rhn-client-tools', fallback=True)
+_ = t.ugettext
gtk.glade.bindtextdomain("rhn-client-tools", "/usr/share/locale")
diff --git a/client/rhel/rhn-client-tools/src/firstboot-legacy-rhel5/rhn_provide_certificate_gui.py b/client/rhel/rhn-client-tools/src/firstboot-legacy-rhel5/rhn_provide_certificate_gui.py
index 319d29a..41b8f73 100644
--- a/client/rhel/rhn-client-tools/src/firstboot-legacy-rhel5/rhn_provide_certificate_gui.py
+++ b/client/rhel/rhn-client-tools/src/firstboot-legacy-rhel5/rhn_provide_certificate_gui.py
@@ -29,9 +29,8 @@ from rhn_register_firstboot_gui_window import RhnRegisterFirstbootGuiWindow
import gtk
from gtk import glade
import gettext
-_ = gettext.gettext
-
-gettext.textdomain("rhn-client-tools")
+t = gettext.translation('rhn-client-tools', fallback=True)
+_ = t.ugettext
gtk.glade.bindtextdomain("rhn-client-tools")
diff --git a/client/rhel/rhn-client-tools/src/firstboot-legacy-rhel5/rhn_review_gui.py b/client/rhel/rhn-client-tools/src/firstboot-legacy-rhel5/rhn_review_gui.py
index 982a67f..8baaa1f 100644
--- a/client/rhel/rhn-client-tools/src/firstboot-legacy-rhel5/rhn_review_gui.py
+++ b/client/rhel/rhn-client-tools/src/firstboot-legacy-rhel5/rhn_review_gui.py
@@ -27,9 +27,8 @@ from rhn_register_firstboot_gui_window import RhnRegisterFirstbootGuiWindow
import gtk
from gtk import glade
import gettext
-_ = gettext.gettext
-
-gettext.textdomain("rhn-client-tools")
+t = gettext.translation('rhn-client-tools', fallback=True)
+_ = t.ugettext
gtk.glade.bindtextdomain("rhn-client-tools")
diff --git a/client/rhel/rhn-client-tools/src/firstboot-legacy-rhel5/rhn_start_gui.py b/client/rhel/rhn-client-tools/src/firstboot-legacy-rhel5/rhn_start_gui.py
index 0a587c2..5fd6f27 100644
--- a/client/rhel/rhn-client-tools/src/firstboot-legacy-rhel5/rhn_start_gui.py
+++ b/client/rhel/rhn-client-tools/src/firstboot-legacy-rhel5/rhn_start_gui.py
@@ -28,9 +28,8 @@ from rhn_register_firstboot_gui_window import RhnRegisterFirstbootGuiWindow
import gtk
from gtk import glade
import gettext
-_ = gettext.gettext
-
-gettext.textdomain("rhn-client-tools")
+t = gettext.translation('rhn-client-tools', fallback=True)
+_ = t.ugettext
gtk.glade.bindtextdomain("rhn-client-tools")
diff --git a/client/rhel/rhn-client-tools/src/up2date_client/capabilities.py b/client/rhel/rhn-client-tools/src/up2date_client/capabilities.py
index 905b878..74f8cf9 100644
--- a/client/rhel/rhn-client-tools/src/up2date_client/capabilities.py
+++ b/client/rhel/rhn-client-tools/src/up2date_client/capabilities.py
@@ -5,7 +5,8 @@ import up2dateErrors
import string
import gettext
-_ = gettext.gettext
+t = gettext.translation('rhn-client-tools', fallback=True)
+_ = t.ugettext
# a dict with "capability name" as the key, and the version
# as the value.
diff --git a/client/rhel/rhn-client-tools/src/up2date_client/config.py b/client/rhel/rhn-client-tools/src/up2date_client/config.py
index 44d24e2..0c0330f 100644
--- a/client/rhel/rhn-client-tools/src/up2date_client/config.py
+++ b/client/rhel/rhn-client-tools/src/up2date_client/config.py
@@ -15,7 +15,8 @@ import os
import sys
import gettext
-_ = gettext.gettext
+t = gettext.translation('rhn-client-tools', fallback=True)
+_ = t.ugettext
# XXX: This could be moved in a more "static" location if it is too
# much of an eye sore
diff --git a/client/rhel/rhn-client-tools/src/up2date_client/gui.py b/client/rhel/rhn-client-tools/src/up2date_client/gui.py
index af8f204..a0d9509 100644
--- a/client/rhel/rhn-client-tools/src/up2date_client/gui.py
+++ b/client/rhel/rhn-client-tools/src/up2date_client/gui.py
@@ -24,7 +24,8 @@ import signal
import xmlrpclib
import gettext
-_ = gettext.gettext
+t = gettext.translation('rhn-client-tools', fallback=True)
+_ = t.ugettext
import up2dateErrors
import config
diff --git a/client/rhel/rhn-client-tools/src/up2date_client/hardware.py b/client/rhel/rhn-client-tools/src/up2date_client/hardware.py
index e384315..363a1e9 100644
--- a/client/rhel/rhn-client-tools/src/up2date_client/hardware.py
+++ b/client/rhel/rhn-client-tools/src/up2date_client/hardware.py
@@ -25,7 +25,8 @@ import config
import ethtool
import gettext
-_ = gettext.gettext
+t = gettext.translation('rhn-client-tools', fallback=True)
+_ = t.ugettext
import dbus
import dmidecode
diff --git a/client/rhel/rhn-client-tools/src/up2date_client/messageWindow.py b/client/rhel/rhn-client-tools/src/up2date_client/messageWindow.py
index 61f97e0..11dcc3a 100644
--- a/client/rhel/rhn-client-tools/src/up2date_client/messageWindow.py
+++ b/client/rhel/rhn-client-tools/src/up2date_client/messageWindow.py
@@ -3,7 +3,8 @@ import string
import gtk
import gettext
-_ = gettext.gettext
+t = gettext.translation('rhn-client-tools', fallback=True)
+_ = t.ugettext
# wrap a long line...
def wrap_line(line, max_line_size = 100):
diff --git a/client/rhel/rhn-client-tools/src/up2date_client/rhnChannel.py b/client/rhel/rhn-client-tools/src/up2date_client/rhnChannel.py
index 379e587..b6a94d4 100644
--- a/client/rhel/rhn-client-tools/src/up2date_client/rhnChannel.py
+++ b/client/rhel/rhn-client-tools/src/up2date_client/rhnChannel.py
@@ -7,11 +7,9 @@ import up2dateErrors
import config
import rhnserver
-
import gettext
-_ = gettext.gettext
-
-
+t = gettext.translation('rhn-client-tools', fallback=True)
+_ = t.ugettext
# heh, dont get much more generic than this...
class rhnChannel:
diff --git a/client/rhel/rhn-client-tools/src/up2date_client/rhncli.py b/client/rhel/rhn-client-tools/src/up2date_client/rhncli.py
index 72f4446..b3d1ccd 100644
--- a/client/rhel/rhn-client-tools/src/up2date_client/rhncli.py
+++ b/client/rhel/rhn-client-tools/src/up2date_client/rhncli.py
@@ -32,7 +32,8 @@ from OpenSSL import crypto
from rhn import rpclib
import gettext
-_ = gettext.gettext
+t = gettext.translation('rhn-client-tools', fallback=True)
+_ = t.ugettext
sys.path.append("/usr/share/rhn/")
@@ -56,7 +57,6 @@ _optionsTable = [
class RhnCli(object):
def __init__(self):
- gettext.textdomain("rhn-client-tools")
self.optparser = OptionParser(option_list = _optionsTable,
version = RhnCli.__versionString())
diff --git a/client/rhel/rhn-client-tools/src/up2date_client/rhnreg.py b/client/rhel/rhn-client-tools/src/up2date_client/rhnreg.py
index 1324d84..9843ee6 100644
--- a/client/rhel/rhn-client-tools/src/up2date_client/rhnreg.py
+++ b/client/rhel/rhn-client-tools/src/up2date_client/rhnreg.py
@@ -31,8 +31,8 @@ except ImportError:
support = None
import gettext
-_ = gettext.gettext
-
+t = gettext.translation('rhn-client-tools', fallback=True)
+_ = t.ugettext
# global variables
YUM_PLUGIN_CONF = '/etc/yum/pluginconf.d/rhnplugin.conf'
diff --git a/client/rhel/rhn-client-tools/src/up2date_client/rhnregGui.py b/client/rhel/rhn-client-tools/src/up2date_client/rhnregGui.py
index bc4b7d8..686f521 100644
--- a/client/rhel/rhn-client-tools/src/up2date_client/rhnregGui.py
+++ b/client/rhel/rhn-client-tools/src/up2date_client/rhnregGui.py
@@ -40,8 +40,8 @@ import gobject
import sys
import os
import gettext
-_ = gettext.gettext
-gettext.textdomain("rhn-client-tools")
+t = gettext.translation('rhn-client-tools', fallback=True)
+_ = t.ugettext
gtk.glade.bindtextdomain("rhn-client-tools")
import rhnreg
diff --git a/client/rhel/rhn-client-tools/src/up2date_client/rhnreg_constants.py b/client/rhel/rhn-client-tools/src/up2date_client/rhnreg_constants.py
index bc70615..ba9a9d9 100644
--- a/client/rhel/rhn-client-tools/src/up2date_client/rhnreg_constants.py
+++ b/client/rhel/rhn-client-tools/src/up2date_client/rhnreg_constants.py
@@ -8,7 +8,8 @@
import gettext
-_ = gettext.gettext
+t = gettext.translation('rhn-client-tools', fallback=True)
+_ = t.ugettext
COPYRIGHT_TEXT = _("Copyright © 2006--2010 Red Hat, Inc. All rights reserved.")
diff --git a/client/rhel/rhn-client-tools/src/up2date_client/rpcServer.py b/client/rhel/rhn-client-tools/src/up2date_client/rpcServer.py
index cffc917..4e255b0 100644
--- a/client/rhel/rhn-client-tools/src/up2date_client/rpcServer.py
+++ b/client/rhel/rhn-client-tools/src/up2date_client/rpcServer.py
@@ -19,8 +19,8 @@ import xmlrpclib
from rhn import rpclib
import gettext
-_ = gettext.gettext
-
+t = gettext.translation('rhn-client-tools', fallback=True)
+_ = t.ugettext
def stdoutMsgCallback(msg):
print msg
diff --git a/client/rhel/rhn-client-tools/src/up2date_client/rpmUtils.py b/client/rhel/rhn-client-tools/src/up2date_client/rpmUtils.py
index e8e3c1b..991616a 100644
--- a/client/rhel/rhn-client-tools/src/up2date_client/rpmUtils.py
+++ b/client/rhel/rhn-client-tools/src/up2date_client/rpmUtils.py
@@ -19,8 +19,8 @@ import rpm
import transaction
import gettext
-_ = gettext.gettext
-
+t = gettext.translation('rhn-client-tools', fallback=True)
+_ = t.ugettext
def installedHeaderByKeyword(**kwargs):
""" just cause this is such a potentially useful looking method... """
diff --git a/client/rhel/rhn-client-tools/src/up2date_client/tui.py b/client/rhel/rhn-client-tools/src/up2date_client/tui.py
index 627047d..345ae37 100644
--- a/client/rhel/rhn-client-tools/src/up2date_client/tui.py
+++ b/client/rhel/rhn-client-tools/src/up2date_client/tui.py
@@ -19,8 +19,8 @@ import sys
import string
import gettext
-_ = gettext.gettext
-gettext.textdomain("rhn-client-tools")
+t = gettext.translation('rhn-client-tools', fallback=True)
+_ = t.ugettext
import snack
diff --git a/client/rhel/rhn-client-tools/src/up2date_client/up2dateErrors.py b/client/rhel/rhn-client-tools/src/up2date_client/up2dateErrors.py
index ded7ea8..da0f529 100644
--- a/client/rhel/rhn-client-tools/src/up2date_client/up2dateErrors.py
+++ b/client/rhel/rhn-client-tools/src/up2date_client/up2dateErrors.py
@@ -9,7 +9,8 @@
import up2dateLog
import gettext
-_ = gettext.gettext
+t = gettext.translation('rhn-client-tools', fallback=True)
+_ = t.ugettext
import OpenSSL
import config
diff --git a/client/rhel/rhn-client-tools/src/up2date_client/up2dateUtils.py b/client/rhel/rhn-client-tools/src/up2date_client/up2dateUtils.py
index 117c9d0..b367fe0 100644
--- a/client/rhel/rhn-client-tools/src/up2date_client/up2dateUtils.py
+++ b/client/rhel/rhn-client-tools/src/up2date_client/up2dateUtils.py
@@ -12,11 +12,9 @@ import string
import up2dateErrors
import transaction
import config
-
-
import gettext
-_ = gettext.gettext
-
+t = gettext.translation('rhn-client-tools', fallback=True)
+_ = t.ugettext
def _getOSVersionAndRelease():
cfg = config.initUp2dateConfig()
diff --git a/client/rhel/yum-rhn-plugin/rhnplugin.py b/client/rhel/yum-rhn-plugin/rhnplugin.py
index cc32716..d2ac6a7 100644
--- a/client/rhel/yum-rhn-plugin/rhnplugin.py
+++ b/client/rhel/yum-rhn-plugin/rhnplugin.py
@@ -23,7 +23,8 @@ except:
from iniparse import INIConfig
import gettext
-_ = gettext.gettext
+t = gettext.translation('yum-rhn-plugin', fallback=True)
+_ = t.ugettext
# TODO: Get the up2date stuff that we need in a better place,
# so we don't have to do path magic.
diff --git a/client/tools/rhn-virtualization/virtualization/poller.py b/client/tools/rhn-virtualization/virtualization/poller.py
index 6c19a98..c54ec96 100644
--- a/client/tools/rhn-virtualization/virtualization/poller.py
+++ b/client/tools/rhn-virtualization/virtualization/poller.py
@@ -19,8 +19,8 @@ sys.path.append("/usr/share/rhn/")
import binascii
import traceback
import gettext
-_ = gettext.gettext
-gettext.textdomain("rhn-virtualization")
+t = gettext.translation('rhn-virtualization', fallback=True)
+_ = t.ugettext
try:
import libvirt
diff --git a/client/tools/rhn-virtualization/virtualization/support.py b/client/tools/rhn-virtualization/virtualization/support.py
index 78a05b0..bc3704d 100755
--- a/client/tools/rhn-virtualization/virtualization/support.py
+++ b/client/tools/rhn-virtualization/virtualization/support.py
@@ -26,9 +26,8 @@ from virtualization.notification import Plan, \
from virtualization.domain_config import DomainConfig
from virtualization.domain_directory import DomainDirectory
import gettext
-_ = gettext.gettext
-gettext.textdomain("rhn-virtualization")
-
+t = gettext.translation('rhn-virtualization', fallback=True)
+_ = t.ugettext
try:
import libvirt
13 years, 2 months
Changes to 'refs/tags/spacewalk-utils-1.4.2-1'
by Michael Mraka
Tag 'spacewalk-utils-1.4.2-1' created by Michael Mraka <michael.mraka(a)redhat.com> at 2011-03-10 13:04 +0000
Tagging package [spacewalk-utils] version [1.4.2-1] in directory [utils/].
Changes since rhnmd-5.3.8-1:
Michael Mraka (2):
made spacewalk-hostname-rename working on postgresql
Automatic commit of package [spacewalk-utils] release [1.4.2-1].
---
rel-eng/packages/spacewalk-utils | 2 +-
utils/spacewalk-hostname-rename | 12 ++++++------
utils/spacewalk-utils.spec | 8 ++++++--
3 files changed, 13 insertions(+), 9 deletions(-)
---
13 years, 2 months
rel-eng/packages utils/spacewalk-utils.spec
by Michael Mraka
rel-eng/packages/spacewalk-utils | 2 +-
utils/spacewalk-utils.spec | 6 +++++-
2 files changed, 6 insertions(+), 2 deletions(-)
New commits:
commit 4b032cfa83863ac38a149a11d36feba226c25339
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Thu Mar 10 14:04:02 2011 +0100
Automatic commit of package [spacewalk-utils] release [1.4.2-1].
diff --git a/rel-eng/packages/spacewalk-utils b/rel-eng/packages/spacewalk-utils
index 9a270e1..8a09831 100644
--- a/rel-eng/packages/spacewalk-utils
+++ b/rel-eng/packages/spacewalk-utils
@@ -1 +1 @@
-1.4.1-1 utils/
+1.4.2-1 utils/
diff --git a/utils/spacewalk-utils.spec b/utils/spacewalk-utils.spec
index 2ebcc96..0890e06 100644
--- a/utils/spacewalk-utils.spec
+++ b/utils/spacewalk-utils.spec
@@ -1,7 +1,7 @@
%define rhnroot %{_prefix}/share/rhn
Name: spacewalk-utils
-Version: 1.4.1
+Version: 1.4.2
Release: 1%{?dist}
Summary: Utilities that may be run against a Spacewalk server.
@@ -69,6 +69,10 @@ rm -rf $RPM_BUILD_ROOT
%changelog
+* Thu Mar 10 2011 Michael Mraka <michael.mraka(a)redhat.com> 1.4.2-1
+- made spacewalk-hostname-rename working on postgresql
+
+
* Thu Feb 03 2011 Michael Mraka <michael.mraka(a)redhat.com> 1.4.1-1
- updated spacewalk-common-channel to spacewalk 1.3
- Bumping package versions for 1.4
13 years, 2 months
utils/spacewalk-hostname-rename utils/spacewalk-utils.spec
by Michael Mraka
utils/spacewalk-hostname-rename | 12 ++++++------
utils/spacewalk-utils.spec | 2 +-
2 files changed, 7 insertions(+), 7 deletions(-)
New commits:
commit f88ed33e217158ab4f5d778129f242077681ddf2
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Thu Mar 10 14:01:14 2011 +0100
made spacewalk-hostname-rename working on postgresql
diff --git a/utils/spacewalk-hostname-rename b/utils/spacewalk-hostname-rename
index 9b9513b..6bc8c79 100755
--- a/utils/spacewalk-hostname-rename
+++ b/utils/spacewalk-hostname-rename
@@ -310,7 +310,7 @@ function re-generate_server_ssl_certificate {
}
function push_monitoring_scounts {
- sqlplus $(spacewalk-cfg-get default_db) >>$LOG 2>&1 <<EOS
+ spacewalk-sql --select-mode - >>$LOG 2>&1 <<EOS
BEGIN
FOR t IN (SELECT ORG.id as FIRST, RSC.recid as SECOND, 1 as THIRD
FROM web_customer ORG INNER JOIN rhn_sat_cluster RSC
@@ -325,7 +325,7 @@ EOS
function update_monitoring_data {
NOCPULSE_OLD_PUBLIC_KEY=`cat $NOCPULSE_PUBLIC_KEY_FILE`
- sqlplus $(spacewalk-cfg-get default_db) >>$LOG <<EOS
+ spacewalk-sql --select-mode - >>$LOG <<EOS
UPDATE rhn_sat_cluster SET vip = '$IP' WHERE public_key LIKE '${NOCPULSE_OLD_PUBLIC_KEY}%';
UPDATE rhn_sat_node SET ip = '$IP' WHERE EXISTS (SELECT 1 FROM rhn_sat_cluster RSC WHERE RSC.public_key LIKE '${NOCPULSE_OLD_PUBLIC_KEY}%' AND sat_cluster_id = RSC.recid);
COMMIT;
@@ -408,7 +408,7 @@ echo "set feed off;
set pages 0;
select 0 from dual;
exit;
-" | sqlplus -s $(spacewalk-cfg-get default_db)
+" | spacewalk-sql --select-mode -
)
# SQL_RET="${SQL_RET#"${SQL_RET%%[![:space:]]*}"}"
print_status "${SQL_RET}" "Your database isn't running."
@@ -440,7 +440,7 @@ if [ -e "${NOCPULSE_INI}" ]
then
backup_file ${NOCPULSE_INI}
echo -n "Updating NOCpulse.ini ... " | tee -a $LOG
- sqlplus $(spacewalk-cfg-get default_db) >>$LOG <<EOS
+ spacewalk-sql --select-mode - >>$LOG <<EOS
UPDATE rhn_config_macro SET definition='$HOSTNAME' WHERE name='RHN_SAT_HOSTNAME';
UPDATE rhn_config_macro SET definition='$HOSTNAME' WHERE name='MDOM';
COMMIT;
@@ -470,7 +470,7 @@ then
fi
echo -n "Updating other DB entries ... " | tee -a $LOG
-sqlplus $(spacewalk-cfg-get default_db) >>$LOG <<EOS
+spacewalk-sql --select-mode - >>$LOG <<EOS
UPDATE rhntemplatestring SET value='$HOSTNAME' WHERE label='hostname';
COMMIT;
QUIT
@@ -484,7 +484,7 @@ print_status $?
echo -n "Changing jabberd settings ... " | tee -a $LOG
# delete old dispatcher(s)
-sqlplus $(spacewalk-cfg-get default_db) >>$LOG <<EOS
+spacewalk-sql --select-mode - >>$LOG <<EOS
DELETE FROM rhnPushDispatcher WHERE hostname != '$HOSTNAME';
COMMIT;
QUIT
diff --git a/utils/spacewalk-utils.spec b/utils/spacewalk-utils.spec
index 46fd3aa..2ebcc96 100644
--- a/utils/spacewalk-utils.spec
+++ b/utils/spacewalk-utils.spec
@@ -22,7 +22,7 @@ Requires: coreutils
Requires: initscripts
Requires: iproute
Requires: net-tools
-Requires: /usr/bin/sqlplus
+Requires: /usr/bin/spacewalk-sql
Requires: perl-Satcon
Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
Requires: python, rpm-python
13 years, 2 months