spacewalk-commits September 2009

spacewalk-commits@lists.fedorahosted.org

8 participants
121 discussions

4 commits - rel-eng/packages selinux/oracle-instantclient-selinux spec-tree/oracle-lib-compat
by Michael Mraka 09 Sep '09

09 Sep '09

rel-eng/packages/oracle-instantclient-selinux | 2 - rel-eng/packages/oracle-lib-compat | 2 - selinux/oracle-instantclient-selinux/oracle-instantclient-selinux.spec | 17 ++++------ spec-tree/oracle-lib-compat/oracle-lib-compat.spec | 10 +++++ 4 files changed, 19 insertions(+), 12 deletions(-) New commits: commit 4f2993816e93108ebae2fade8908f3a407db8d6d Author: Michael Mraka <michael.mraka(a)redhat.com> Date: Wed Sep 9 15:25:22 2009 +0200 Automatic commit of package [oracle-instantclient-selinux] minor release [10.2-16]. diff --git a/rel-eng/packages/oracle-instantclient-selinux b/rel-eng/packages/oracle-instantclient-selinux index f6ef1bd..dcaf6e5 100644 --- a/rel-eng/packages/oracle-instantclient-selinux +++ b/rel-eng/packages/oracle-instantclient-selinux @@ -1 +1 @@ -10.2-15 selinux/oracle-instantclient-selinux/ +10.2-16 selinux/oracle-instantclient-selinux/ diff --git a/selinux/oracle-instantclient-selinux/oracle-instantclient-selinux.spec b/selinux/oracle-instantclient-selinux/oracle-instantclient-selinux.spec index 0cd0429..700ff2a 100644 --- a/selinux/oracle-instantclient-selinux/oracle-instantclient-selinux.spec +++ b/selinux/oracle-instantclient-selinux/oracle-instantclient-selinux.spec @@ -1,7 +1,7 @@ Name: oracle-instantclient-selinux Version: 10.2 -Release: 15%{?dist} +Release: 16%{?dist} Summary: SELinux support for Oracle Instant Client Group: System Environment/Base License: GPLv2+ @@ -110,6 +110,9 @@ fi %attr(0755,root,root) %{_sbindir}/oracle-instantclient-sqlplus-selinux-enable %changelog +* Wed Sep 09 2009 Michael Mraka <michael.mraka(a)redhat.com> 10.2-16 +- 506951 - execstack -c moved to instantclient packages + * Mon Jun 15 2009 Miroslav Suchy <msuchy(a)redhat.com> 10.2-15 - 498611 - run "semodule -i" in %%post and restorecon in %%posttrans commit 24f80d6bd6f932954d83f98f6254023c2ef81a06 Author: Michael Mraka <michael.mraka(a)redhat.com> Date: Wed Sep 9 15:24:44 2009 +0200 Automatic commit of package [oracle-lib-compat] minor release [10.2-21]. diff --git a/rel-eng/packages/oracle-lib-compat b/rel-eng/packages/oracle-lib-compat index 1b6d81a..fb6794c 100644 --- a/rel-eng/packages/oracle-lib-compat +++ b/rel-eng/packages/oracle-lib-compat @@ -1 +1 @@ -10.2-20 spec-tree/oracle-lib-compat/ +10.2-21 spec-tree/oracle-lib-compat/ diff --git a/spec-tree/oracle-lib-compat/oracle-lib-compat.spec b/spec-tree/oracle-lib-compat/oracle-lib-compat.spec index 4d6d479..acc90d9 100644 --- a/spec-tree/oracle-lib-compat/oracle-lib-compat.spec +++ b/spec-tree/oracle-lib-compat/oracle-lib-compat.spec @@ -1,6 +1,6 @@ Name: oracle-lib-compat Version: 10.2 -Release: 20%{?dist} +Release: 21%{?dist} Summary: Compatibility package so that perl-DBD-Oracle will install Group: Applications/Multimedia License: GPLv2 @@ -84,6 +84,9 @@ find %{_prefix}/lib/oracle/%{icversion} \ | xargs execstack -c %changelog +* Wed Sep 09 2009 Michael Mraka <michael.mraka(a)redhat.com> 10.2-21 +- 506951 - clear exec stack on instantclient libs (fixes selinux avc denial) + * Tue Apr 07 2009 Michael Mraka <michael.mraka(a)redhat.com> 10.2-20 - specified exact version of instantclient commit b5b8b656952d558da99ea3e3b4bd76bc839eddaa Author: Michael Mraka <michael.mraka(a)redhat.com> Date: Wed Sep 9 15:22:48 2009 +0200 506951 - execstack -c moved to instantclient packages diff --git a/selinux/oracle-instantclient-selinux/oracle-instantclient-selinux.spec b/selinux/oracle-instantclient-selinux/oracle-instantclient-selinux.spec index 11983de..0cd0429 100644 --- a/selinux/oracle-instantclient-selinux/oracle-instantclient-selinux.spec +++ b/selinux/oracle-instantclient-selinux/oracle-instantclient-selinux.spec @@ -14,8 +14,8 @@ URL: http://fedorahosted.org/spacewalk BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch -Requires(post): /usr/sbin/semanage, /sbin/restorecon, /usr/bin/execstack, /usr/sbin/selinuxenabled -Requires(postun): /usr/sbin/semanage, /sbin/restorecon, /usr/bin/execstack +Requires(post): /usr/sbin/semanage, /sbin/restorecon, /usr/sbin/selinuxenabled +Requires(postun): /usr/sbin/semanage, /sbin/restorecon Requires: oracle-instantclient-basic Requires: oracle-nofcontext-selinux @@ -27,8 +27,8 @@ Summary: SELinux support for Oracle Instant Client sqlplus Group: System Environment/Base Requires: oracle-instantclient-sqlplus Requires: oracle-nofcontext-selinux -Requires(post): /usr/sbin/semanage, /sbin/restorecon, /usr/bin/execstack, /usr/sbin/selinuxenabled -Requires(postun): /usr/sbin/semanage, /sbin/restorecon, /usr/bin/execstack +Requires(post): /usr/sbin/semanage, /sbin/restorecon, /usr/sbin/selinuxenabled +Requires(postun): /usr/sbin/semanage, /sbin/restorecon %description -n oracle-instantclient-sqlplus-selinux SELinux support for Oracle Instant Client sqlplus. @@ -49,7 +49,6 @@ cat <<'EOS' > %{buildroot}%{_sbindir}/%{name}-enable for i in %used_libs ; do /usr/sbin/semanage fcontext -a -t textrel_shlib_t '/usr/lib/oracle/10\.2\..*/client.*/lib/'${i//./\\.} - /usr/bin/execstack -c /usr/lib/oracle/10.2.*/client*/lib/$i done /sbin/restorecon -Rvv /usr/lib/oracle/10.2.*/client* || : @@ -60,7 +59,6 @@ cat <<'EOS' > %{buildroot}%{_sbindir}/oracle-instantclient-sqlplus-selinux-enabl /usr/sbin/semanage fcontext -a -t oracle_sqlplus_exec_t '/usr/lib/oracle/10\.2\..*/client.*/bin/sqlplus' /usr/sbin/semanage fcontext -a -t textrel_shlib_t '/usr/lib/oracle/10\.2\..*/client.*/lib/libsqlplus\.so' -/usr/bin/execstack -c /usr/lib/oracle/10.2.*/client*/lib/libsqlplus.so /sbin/restorecon -Rvv /usr/lib/oracle/10.2.*/client* || : EOS @@ -83,7 +81,6 @@ fi if [ $1 -eq 0 ]; then for i in %used_libs ; do /usr/sbin/semanage fcontext -d -t textrel_shlib_t '/usr/lib/oracle/10\.2\..*/client.*/lib/'${i//./\\.} - # /usr/bin/execstack -s /usr/lib/oracle/10.2.*/client*/lib/$i done /sbin/restorecon -Rvv /usr/lib/oracle/10.2.*/client* || : fi @@ -103,7 +100,6 @@ fi if [ $1 -eq 0 ]; then /usr/sbin/semanage fcontext -d -t oracle_sqlplus_exec_t '/usr/lib/oracle/10\.2\..*/client.*/bin/sqlplus' /usr/sbin/semanage fcontext -d -t textrel_shlib_t '/usr/lib/oracle/10\.2\..*/client.*/lib/libsqlplus\.so' - # /usr/bin/execstack -s /usr/lib/oracle/10.2.*/client*/lib/libsqlplus.so /sbin/restorecon -Rvv /usr/lib/oracle/10.2.*/client* || : fi commit a6936f7fc5067dbc8d3ca7e3097cd7b5edaeb63e Author: Michael Mraka <michael.mraka(a)redhat.com> Date: Wed Sep 9 15:20:46 2009 +0200 506951 - clear exec stack on instantclient libs (fixes selinux avc denial) diff --git a/spec-tree/oracle-lib-compat/oracle-lib-compat.spec b/spec-tree/oracle-lib-compat/oracle-lib-compat.spec index 0954fd5..4d6d479 100644 --- a/spec-tree/oracle-lib-compat/oracle-lib-compat.spec +++ b/spec-tree/oracle-lib-compat/oracle-lib-compat.spec @@ -21,6 +21,7 @@ BuildRoot: %{_tmppath}/%{name}-root-%(%{__id_u} -n) Requires: oracle-instantclient-basic = %{icversion} Requires: oracle-instantclient-sqlplus = %{icversion} Requires(post): ldconfig +Requires(post): /usr/bin/execstack %ifarch x86_64 %define lib64 ()(64bit) @@ -77,6 +78,10 @@ rm -rf $RPM_BUILD_ROOT %post ldconfig +# clear execstack on libs in oracle's provided instantclient rpm +find %{_prefix}/lib/oracle/%{icversion} \ + | xargs file | awk -F: '/ELF.*(executable|shared object)/ {print $1}' \ + | xargs execstack -c %changelog * Tue Apr 07 2009 Michael Mraka <michael.mraka(a)redhat.com> 10.2-20

1 0

Branch 'VADER' - spacewalk/setup
by Michael Mraka 04 Sep '09

04 Sep '09

spacewalk/setup/lib/Spacewalk/Setup.pm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) New commits: commit 0fbf148062e948f5d11b78144aa80c8e1b1b6a3b Author: Michael Mraka <michael.mraka(a)redhat.com> Date: Fri Sep 4 15:02:14 2009 +0200 fixed check_users_exist, check_groups_exist - only first user/group was checked diff --git a/spacewalk/setup/lib/Spacewalk/Setup.pm b/spacewalk/setup/lib/Spacewalk/Setup.pm index 80cec19..b206b83 100644 --- a/spacewalk/setup/lib/Spacewalk/Setup.pm +++ b/spacewalk/setup/lib/Spacewalk/Setup.pm @@ -375,7 +375,7 @@ sub log_rotate { } sub check_users_exist { - my @required_users = shift; + my @required_users = @_; my $missing_a_user; @@ -393,7 +393,7 @@ sub check_users_exist { } sub check_groups_exist { - my @required_groups = shift; + my @required_groups = @_; my $missing_a_group;

1 0

spacewalk/setup
by Michael Mraka 04 Sep '09

04 Sep '09

spacewalk/setup/lib/Spacewalk/Setup.pm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) New commits: commit 7f971c06de2ac869c138791252dd70d1496a3c78 Author: Michael Mraka <michael.mraka(a)redhat.com> Date: Fri Sep 4 15:02:14 2009 +0200 fixed check_users_exist, check_groups_exist - only first user/group was checked diff --git a/spacewalk/setup/lib/Spacewalk/Setup.pm b/spacewalk/setup/lib/Spacewalk/Setup.pm index b617267..402aae3 100644 --- a/spacewalk/setup/lib/Spacewalk/Setup.pm +++ b/spacewalk/setup/lib/Spacewalk/Setup.pm @@ -378,7 +378,7 @@ sub log_rotate { } sub check_users_exist { - my @required_users = shift; + my @required_users = @_; my $missing_a_user; @@ -396,7 +396,7 @@ sub check_users_exist { } sub check_groups_exist { - my @required_groups = shift; + my @required_groups = @_; my $missing_a_group;

1 0

Changes to 'refs/tags/rhn-client-tools-0.7.2-1'
by Miroslav Suchý 04 Sep '09

04 Sep '09

Tag 'rhn-client-tools-0.7.2-1' created by Miroslav Suchý <msuchy(a)redhat.com> at 2009-09-04 11:25 +0000 Tagging package [rhn-client-tools] version [0.7.2-1] in directory [client/rhel/rhn-client-tools/]. Changes since spacewalk-backend-0.7.4-1: Lukáš Ďurfina (1): Rhpl was removed from rhel client packages Miroslav Suchý (1): Automatic commit of package [rhn-client-tools] release [0.7.2-1]. --- 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 | 4 +++- client/rhel/rhn-client-tools/src/firstboot/rhn_activate_gui.py | 7 ++++--- client/rhel/rhn-client-tools/src/firstboot/rhn_choose_org_gui.py | 7 ++++--- client/rhel/rhn-client-tools/src/firstboot/rhn_choose_server_gui.py | 7 ++++--- client/rhel/rhn-client-tools/src/firstboot/rhn_create_profile_gui.py | 6 +++--- client/rhel/rhn-client-tools/src/firstboot/rhn_finish_gui.py | 7 ++++--- client/rhel/rhn-client-tools/src/firstboot/rhn_login_gui.py | 7 ++++--- client/rhel/rhn-client-tools/src/firstboot/rhn_provide_certificate_gui.py | 7 ++++--- client/rhel/rhn-client-tools/src/firstboot/rhn_review_gui.py | 7 ++++--- client/rhel/rhn-client-tools/src/firstboot/rhn_start_gui.py | 7 ++++--- 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 | 5 +++-- client/rhel/rhn-client-tools/src/up2date_client/messageWindow.py | 3 ++- client/rhel/rhn-client-tools/src/up2date_client/rhnChannel.py | 3 ++- client/rhel/rhn-client-tools/src/up2date_client/rhncli.py | 5 +++-- client/rhel/rhn-client-tools/src/up2date_client/rhnreg.py | 3 ++- client/rhel/rhn-client-tools/src/up2date_client/rhnregGui.py | 5 +++-- client/rhel/rhn-client-tools/src/up2date_client/rhnreg_constants.py | 3 ++- client/rhel/rhn-client-tools/src/up2date_client/rpcServer.py | 7 ++++--- client/rhel/rhn-client-tools/src/up2date_client/rpmUtils.py | 8 +++----- client/rhel/rhn-client-tools/src/up2date_client/tui.py | 5 +++-- client/rhel/rhn-client-tools/src/up2date_client/up2dateErrors.py | 3 ++- client/rhel/rhn-client-tools/src/up2date_client/up2dateUtils.py | 3 ++- client/rhel/yum-rhn-plugin/rhnplugin.py | 3 ++- client/rhel/yum-rhn-plugin/yum-rhn-plugin.spec | 1 - rel-eng/packages/rhn-client-tools | 2 +- 31 files changed, 87 insertions(+), 60 deletions(-) ---

1 0

client/rhel rel-eng/packages
by Miroslav Suchý 04 Sep '09

04 Sep '09

client/rhel/rhn-client-tools/rhn-client-tools.spec | 5 ++++- rel-eng/packages/rhn-client-tools | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) New commits: commit fd85f3c5170e73a2a3ee181c12b5d8009d1cbd19 Author: Miroslav Suchý <msuchy(a)redhat.com> Date: Fri Sep 4 13:25:49 2009 +0200 Automatic commit of package [rhn-client-tools] release [0.7.2-1]. diff --git a/client/rhel/rhn-client-tools/rhn-client-tools.spec b/client/rhel/rhn-client-tools/rhn-client-tools.spec index caeb102..f203805 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: 0.7.1 +Version: 0.7.2 Release: 1%{?dist} BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch @@ -215,6 +215,9 @@ rm -rf $RPM_BUILD_ROOT %{_datadir}/applications/rhn_register.desktop %changelog +* Fri Sep 4 2009 Miroslav Suchy <msuchy(a)redhat.com> 0.7.2-1 +- Rhpl was removed from rhel client packages (lukas.durfina(a)gmail.com) + * Tue Sep 1 2009 Miroslav Suchy <msuchy(a)redhat.com> 0.7.1-1 - change appeareance of icon and put it to Administration rather then to Preferences - add scriplet to refres icon cache diff --git a/rel-eng/packages/rhn-client-tools b/rel-eng/packages/rhn-client-tools index 11eb33d..7b786a3 100644 --- a/rel-eng/packages/rhn-client-tools +++ b/rel-eng/packages/rhn-client-tools @@ -1 +1 @@ -0.7.1-1 client/rhel/rhn-client-tools/ +0.7.2-1 client/rhel/rhn-client-tools/

1 0

client/rhel
by Miroslav Suchý 04 Sep '09

04 Sep '09

client/rhel/rhn-client-tools/rhn-client-tools.spec | 2 +- 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 | 4 +++- client/rhel/rhn-client-tools/src/firstboot/rhn_activate_gui.py | 7 ++++--- client/rhel/rhn-client-tools/src/firstboot/rhn_choose_org_gui.py | 7 ++++--- client/rhel/rhn-client-tools/src/firstboot/rhn_choose_server_gui.py | 7 ++++--- client/rhel/rhn-client-tools/src/firstboot/rhn_create_profile_gui.py | 6 +++--- client/rhel/rhn-client-tools/src/firstboot/rhn_finish_gui.py | 7 ++++--- client/rhel/rhn-client-tools/src/firstboot/rhn_login_gui.py | 7 ++++--- client/rhel/rhn-client-tools/src/firstboot/rhn_provide_certificate_gui.py | 7 ++++--- client/rhel/rhn-client-tools/src/firstboot/rhn_review_gui.py | 7 ++++--- client/rhel/rhn-client-tools/src/firstboot/rhn_start_gui.py | 7 ++++--- 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 | 5 +++-- client/rhel/rhn-client-tools/src/up2date_client/messageWindow.py | 3 ++- client/rhel/rhn-client-tools/src/up2date_client/rhnChannel.py | 3 ++- client/rhel/rhn-client-tools/src/up2date_client/rhncli.py | 5 +++-- client/rhel/rhn-client-tools/src/up2date_client/rhnreg.py | 3 ++- client/rhel/rhn-client-tools/src/up2date_client/rhnregGui.py | 5 +++-- client/rhel/rhn-client-tools/src/up2date_client/rhnreg_constants.py | 3 ++- client/rhel/rhn-client-tools/src/up2date_client/rpcServer.py | 7 ++++--- client/rhel/rhn-client-tools/src/up2date_client/rpmUtils.py | 8 +++----- client/rhel/rhn-client-tools/src/up2date_client/tui.py | 5 +++-- client/rhel/rhn-client-tools/src/up2date_client/up2dateErrors.py | 3 ++- client/rhel/rhn-client-tools/src/up2date_client/up2dateUtils.py | 3 ++- client/rhel/yum-rhn-plugin/rhnplugin.py | 3 ++- client/rhel/yum-rhn-plugin/yum-rhn-plugin.spec | 1 - 30 files changed, 82 insertions(+), 58 deletions(-) New commits: commit f5062c3f6d928dfa75ce7b7e458eef99635620d4 Author: Lukáš Ďurfina <lukas.durfina(a)gmail.com> Date: Fri Aug 21 14:19:59 2009 +0200 Rhpl was removed from rhel client packages It was done due to creating and maintaining deb packages and this message http://www.mail-archive.com/fedora-devel-list@redhat.com/msg05644.html Signed-off-by: Miroslav Suchý <msuchy(a)redhat.com> diff --git a/client/rhel/rhn-client-tools/rhn-client-tools.spec b/client/rhel/rhn-client-tools/rhn-client-tools.spec index a03b710..caeb102 100644 --- a/client/rhel/rhn-client-tools/rhn-client-tools.spec +++ b/client/rhel/rhn-client-tools/rhn-client-tools.spec @@ -10,9 +10,9 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch Requires: rhnlib >= 2.2.7 -Requires: rhpl >= 0.81-2 Requires: rpm >= 4.2.3-24_nonptl Requires: rpm-python +Requires: python-ethtool Requires: gnupg Requires: sh-utils Requires: dbus-python 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 719fde2..2ed2dcb 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 @@ -11,7 +11,8 @@ import sys -from rhpl.translate import _ +import gettext +_ = gettext.gettext 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 f72ae17..3455258 100644 --- a/client/rhel/rhn-client-tools/src/bin/rhn_register.py +++ b/client/rhel/rhn-client-tools/src/bin/rhn_register.py @@ -13,7 +13,8 @@ import sys import os -from rhpl.translate import _ +import gettext +_ = gettext.gettext if "--development" in sys.argv: sys.path.append("../") 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 e1e6b16..e21f18e 100755 --- a/client/rhel/rhn-client-tools/src/bin/rhnreg_ks.py +++ b/client/rhel/rhn-client-tools/src/bin/rhnreg_ks.py @@ -22,7 +22,9 @@ import sys import os -from rhpl.translate import _ + +import gettext +_ = gettext.gettext sys.path.append("/usr/share/rhn/") diff --git a/client/rhel/rhn-client-tools/src/firstboot/rhn_activate_gui.py b/client/rhel/rhn-client-tools/src/firstboot/rhn_activate_gui.py index 8e8f8e2..13eec7c 100644 --- a/client/rhel/rhn-client-tools/src/firstboot/rhn_activate_gui.py +++ b/client/rhel/rhn-client-tools/src/firstboot/rhn_activate_gui.py @@ -36,9 +36,10 @@ import rhnregGui import up2dateErrors import messageWindow -from rhpl.translate import _, N_ -import rhpl.translate as translate -translate.textdomain("rhn-client-tools") +import gettext +_ = gettext.gettext + +gettext.textdomain("rhn-client-tools") gtk.glade.bindtextdomain("rhn-client-tools") diff --git a/client/rhel/rhn-client-tools/src/firstboot/rhn_choose_org_gui.py b/client/rhel/rhn-client-tools/src/firstboot/rhn_choose_org_gui.py index f7e422c..a3b20c7 100644 --- a/client/rhel/rhn-client-tools/src/firstboot/rhn_choose_org_gui.py +++ b/client/rhel/rhn-client-tools/src/firstboot/rhn_choose_org_gui.py @@ -26,9 +26,10 @@ from rhn_register_firstboot_gui_window import RhnRegisterFirstbootGuiWindow import gtk from gtk import glade -from rhpl.translate import _, N_ -from rhpl import translate -translate.textdomain("rhn-client-tools") +import gettext +_ = gettext.gettext + +gettext.textdomain("rhn-client-tools") gtk.glade.bindtextdomain("rhn-client-tools") diff --git a/client/rhel/rhn-client-tools/src/firstboot/rhn_choose_server_gui.py b/client/rhel/rhn-client-tools/src/firstboot/rhn_choose_server_gui.py index aea4a43..83f88ab 100644 --- a/client/rhel/rhn-client-tools/src/firstboot/rhn_choose_server_gui.py +++ b/client/rhel/rhn-client-tools/src/firstboot/rhn_choose_server_gui.py @@ -28,9 +28,10 @@ from rhn_register_firstboot_gui_window import RhnRegisterFirstbootGuiWindow import gtk from gtk import glade -from rhpl.translate import _, N_ -from rhpl import translate -translate.textdomain("rhn-client-tools") +import gettext +_ = gettext.gettext + +gettext.textdomain("rhn-client-tools") gtk.glade.bindtextdomain("rhn-client-tools") diff --git a/client/rhel/rhn-client-tools/src/firstboot/rhn_create_profile_gui.py b/client/rhel/rhn-client-tools/src/firstboot/rhn_create_profile_gui.py index 891530c..e49b520 100644 --- a/client/rhel/rhn-client-tools/src/firstboot/rhn_create_profile_gui.py +++ b/client/rhel/rhn-client-tools/src/firstboot/rhn_create_profile_gui.py @@ -36,9 +36,9 @@ import rhnregGui import up2dateErrors import messageWindow -from rhpl.translate import _, N_ -import rhpl.translate as translate -translate.textdomain("rhn-client-tools") +import gettext +_ = gettext.gettext +gettext.textdomain("rhn-client-tools") gtk.glade.bindtextdomain("rhn-client-tools") diff --git a/client/rhel/rhn-client-tools/src/firstboot/rhn_finish_gui.py b/client/rhel/rhn-client-tools/src/firstboot/rhn_finish_gui.py index 393ec05..a5fc8b4 100644 --- a/client/rhel/rhn-client-tools/src/firstboot/rhn_finish_gui.py +++ b/client/rhel/rhn-client-tools/src/firstboot/rhn_finish_gui.py @@ -26,9 +26,10 @@ from rhn_register_firstboot_gui_window import RhnRegisterFirstbootGuiWindow import gtk from gtk import glade -from rhpl.translate import _, N_ -from rhpl import translate -translate.textdomain("rhn-client-tools") +import gettext +_ = gettext.gettext + +gettext.textdomain("rhn-client-tools") gtk.glade.bindtextdomain("rhn-client-tools") diff --git a/client/rhel/rhn-client-tools/src/firstboot/rhn_login_gui.py b/client/rhel/rhn-client-tools/src/firstboot/rhn_login_gui.py index 94e3dff..05e070c 100644 --- a/client/rhel/rhn-client-tools/src/firstboot/rhn_login_gui.py +++ b/client/rhel/rhn-client-tools/src/firstboot/rhn_login_gui.py @@ -40,9 +40,10 @@ import messageWindow ## ## I18N ## -from rhpl.translate import _, N_ -import rhpl.translate as translate -translate.textdomain("rhn-client-tools") +import gettext +_ = gettext.gettext + +gettext.textdomain("rhn-client-tools") gtk.glade.bindtextdomain("rhn-client-tools", "/usr/share/locale") diff --git a/client/rhel/rhn-client-tools/src/firstboot/rhn_provide_certificate_gui.py b/client/rhel/rhn-client-tools/src/firstboot/rhn_provide_certificate_gui.py index f307cb3..319d29a 100644 --- a/client/rhel/rhn-client-tools/src/firstboot/rhn_provide_certificate_gui.py +++ b/client/rhel/rhn-client-tools/src/firstboot/rhn_provide_certificate_gui.py @@ -28,9 +28,10 @@ from rhn_register_firstboot_gui_window import RhnRegisterFirstbootGuiWindow import gtk from gtk import glade -from rhpl.translate import _, N_ -from rhpl import translate -translate.textdomain("rhn-client-tools") +import gettext +_ = gettext.gettext + +gettext.textdomain("rhn-client-tools") gtk.glade.bindtextdomain("rhn-client-tools") diff --git a/client/rhel/rhn-client-tools/src/firstboot/rhn_review_gui.py b/client/rhel/rhn-client-tools/src/firstboot/rhn_review_gui.py index 02b7fc9..982a67f 100644 --- a/client/rhel/rhn-client-tools/src/firstboot/rhn_review_gui.py +++ b/client/rhel/rhn-client-tools/src/firstboot/rhn_review_gui.py @@ -26,9 +26,10 @@ from rhn_register_firstboot_gui_window import RhnRegisterFirstbootGuiWindow import gtk from gtk import glade -from rhpl.translate import _, N_ -from rhpl import translate -translate.textdomain("rhn-client-tools") +import gettext +_ = gettext.gettext + +gettext.textdomain("rhn-client-tools") gtk.glade.bindtextdomain("rhn-client-tools") diff --git a/client/rhel/rhn-client-tools/src/firstboot/rhn_start_gui.py b/client/rhel/rhn-client-tools/src/firstboot/rhn_start_gui.py index c6a7dd2..0a587c2 100644 --- a/client/rhel/rhn-client-tools/src/firstboot/rhn_start_gui.py +++ b/client/rhel/rhn-client-tools/src/firstboot/rhn_start_gui.py @@ -27,9 +27,10 @@ from rhn_register_firstboot_gui_window import RhnRegisterFirstbootGuiWindow import gtk from gtk import glade -from rhpl.translate import _, N_ -from rhpl import translate -translate.textdomain("rhn-client-tools") +import gettext +_ = gettext.gettext + +gettext.textdomain("rhn-client-tools") 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 3741b4e..905b878 100644 --- a/client/rhel/rhn-client-tools/src/up2date_client/capabilities.py +++ b/client/rhel/rhn-client-tools/src/up2date_client/capabilities.py @@ -4,7 +4,8 @@ import config import up2dateErrors import string -from rhpl.translate import _ +import gettext +_ = gettext.gettext # 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 b1b7845..0fff0df 100644 --- a/client/rhel/rhn-client-tools/src/up2date_client/config.py +++ b/client/rhel/rhn-client-tools/src/up2date_client/config.py @@ -14,7 +14,8 @@ up2date agent to hold config info. import os import sys -from rhpl.translate import _ +import gettext +_ = gettext.gettext # 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 9d84aad..06aaa39 100644 --- a/client/rhel/rhn-client-tools/src/up2date_client/gui.py +++ b/client/rhel/rhn-client-tools/src/up2date_client/gui.py @@ -32,7 +32,8 @@ import gnome.ui import signal from rhn import rpclib -from rhpl.translate import _ +import gettext +_ = gettext.gettext 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 115bce8..d9f4269 100644 --- a/client/rhel/rhn-client-tools/src/up2date_client/hardware.py +++ b/client/rhel/rhn-client-tools/src/up2date_client/hardware.py @@ -18,8 +18,9 @@ import types import config -from rhpl import ethtool -from rhpl.translate import _, N_ +import ethtool +import gettext +_ = gettext.gettext from haltree import HalTree, HalDevice import dbus 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 b9cc742..3bf02eb 100644 --- a/client/rhel/rhn-client-tools/src/up2date_client/messageWindow.py +++ b/client/rhel/rhn-client-tools/src/up2date_client/messageWindow.py @@ -2,7 +2,8 @@ import string import gtk -from rhpl.translate import _ +import gettext +_ = gettext.gettext # 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 861b2d0..bd7619d 100644 --- a/client/rhel/rhn-client-tools/src/up2date_client/rhnChannel.py +++ b/client/rhel/rhn-client-tools/src/up2date_client/rhnChannel.py @@ -8,7 +8,8 @@ import config import rhnserver -from rhpl.translate import _ +import gettext +_ = gettext.gettext 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 6bc203d..765c940 100644 --- a/client/rhel/rhn-client-tools/src/up2date_client/rhncli.py +++ b/client/rhel/rhn-client-tools/src/up2date_client/rhncli.py @@ -20,7 +20,8 @@ from OpenSSL import crypto from rhn import rpclib -from rhpl.translate import _, textdomain +import gettext +_ = gettext.gettext sys.path.append("/usr/share/rhn/") @@ -47,7 +48,7 @@ _optionsTable = [ class RhnCli(object): def __init__(self): - textdomain("rhn-client-tools") + 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 5742ac7..3df0629 100644 --- a/client/rhel/rhn-client-tools/src/up2date_client/rhnreg.py +++ b/client/rhel/rhn-client-tools/src/up2date_client/rhnreg.py @@ -37,7 +37,8 @@ try: except ImportError: support = None -from rhpl.translate import _ +import gettext +_ = gettext.gettext # global variables 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 26d7de0..b727669 100644 --- a/client/rhel/rhn-client-tools/src/up2date_client/rhnregGui.py +++ b/client/rhel/rhn-client-tools/src/up2date_client/rhnregGui.py @@ -33,8 +33,9 @@ import gobject import sys import os import stat -from rhpl.translate import _, textdomain -textdomain("rhn-client-tools") +import gettext +_ = gettext.gettext +gettext.textdomain("rhn-client-tools") 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 4b381c0..ab702e0 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 @@ -7,7 +7,8 @@ # James Slagle <jslagle(a)redhat.com> -from rhpl.translate import _ +import gettext +_ = gettext.gettext COPYRIGHT_TEXT = _("Copyright © 2006 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 87b6662..b54be87 100644 --- a/client/rhel/rhn-client-tools/src/up2date_client/rpcServer.py +++ b/client/rhel/rhn-client-tools/src/up2date_client/rpcServer.py @@ -16,9 +16,10 @@ import up2dateUtils import up2dateAuth from rhn import rpclib - -from rhpl.translate import _ - + +import gettext +_ = gettext.gettext + 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 2bc168e..322ed85 100644 --- a/client/rhel/rhn-client-tools/src/up2date_client/rpmUtils.py +++ b/client/rhel/rhn-client-tools/src/up2date_client/rpmUtils.py @@ -13,15 +13,13 @@ # fix by moving to up2dateErrors.py and importing from there # # - -import os +import os import rpm - import transaction - -from rhpl.translate import _ +import gettext +_ = gettext.gettext # 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 1a784f6..b636114 100644 --- a/client/rhel/rhn-client-tools/src/up2date_client/tui.py +++ b/client/rhel/rhn-client-tools/src/up2date_client/tui.py @@ -10,8 +10,9 @@ from os import geteuid import sys import string -from rhpl.translate import _, textdomain -textdomain("rhn-client-tools") +import gettext +_ = gettext.gettext +gettext.textdomain("rhn-client-tools") 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 e06736d..e4d99d7 100644 --- a/client/rhel/rhn-client-tools/src/up2date_client/up2dateErrors.py +++ b/client/rhel/rhn-client-tools/src/up2date_client/up2dateErrors.py @@ -8,7 +8,8 @@ # import up2dateLog -from rhpl.translate import _ +import gettext +_ = gettext.gettext 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 9ee6198..34ee06e 100644 --- a/client/rhel/rhn-client-tools/src/up2date_client/up2dateUtils.py +++ b/client/rhel/rhn-client-tools/src/up2date_client/up2dateUtils.py @@ -17,7 +17,8 @@ import transaction import config -from rhpl.translate import _ +import gettext +_ = gettext.gettext def _getOSVersionAndRelease(): diff --git a/client/rhel/yum-rhn-plugin/rhnplugin.py b/client/rhel/yum-rhn-plugin/rhnplugin.py index 34ad320..d9bed15 100644 --- a/client/rhel/yum-rhn-plugin/rhnplugin.py +++ b/client/rhel/yum-rhn-plugin/rhnplugin.py @@ -17,7 +17,8 @@ import yum.Errors from urlgrabber.grabber import URLGrabber from urlgrabber.grabber import URLGrabError -from rhpl.translate import _ +import gettext +_ = gettext.gettext # 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/rhel/yum-rhn-plugin/yum-rhn-plugin.spec b/client/rhel/yum-rhn-plugin/yum-rhn-plugin.spec index f18d161..03c4b05 100644 --- a/client/rhel/yum-rhn-plugin/yum-rhn-plugin.spec +++ b/client/rhel/yum-rhn-plugin/yum-rhn-plugin.spec @@ -9,7 +9,6 @@ Url: http://rhn.redhat.com BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch BuildRequires: python -BuildRequires: rhpl BuildRequires: intltool BuildRequires: gettext

1 0

Changes to 'refs/tags/spacewalk-backend-0.7.4-1'
by Michael Mraka 04 Sep '09

04 Sep '09

Tag 'spacewalk-backend-0.7.4-1' created by Michael Mraka <michael.mraka(a)redhat.com> at 2009-09-04 07:43 +0000 Tagging package [spacewalk-backend] version [0.7.4-1] in directory [backend/]. Changes since spacewalk-setup-0.7.4-1: Justin Sherrill (2): fixing issue where errata cache task was pulling ALL tasks out of the queue and not just the two it actually was using fixing issue where repo_sync tasks would not get removed under certain conditions Michael Mraka (3): fixed output of multivalue variables (lists) don't use keyword as a variable name Automatic commit of package [spacewalk-backend] release [0.7.4-1]. Milan Zazrivec (1): spacewalk-setup-jabberd man page fixes Miroslav Suchý (7): change url, source0 and requires according to packaging guidelines add LSB header implement try-restart as alias for condrestart versioned obsolete and provide the obsolete package move rhnplugin from /var/lib/yum-plugins to /usr/share/yum-plugins - it is not executable use macros in spec file add .tar.bz2 to known suffixes Partha Aji (1): Made hibernate configs use new configs. --- backend/common/spacewalk-cfg-get | 13 ++- backend/spacewalk-backend.spec | 5 - client/rhel/rhnsd/rhnsd.init | 19 ++++ client/rhel/rhnsd/rhnsd.spec | 10 +- client/rhel/yum-rhn-plugin/Makefile.yum-rhn-plugin | 2 client/rhel/yum-rhn-plugin/yum-rhn-plugin.spec | 15 +-- java/code/src/com/redhat/rhn/common/hibernate/ConnectionManager.java | 42 +++++++++- java/code/src/com/redhat/rhn/domain/task/TaskFactory.java | 2 java/code/src/com/redhat/rhn/taskomatic/task/RepoSyncTask.java | 6 + java/code/src/com/redhat/rhn/taskomatic/task/errata/ErrataCacheDriver.java | 6 - java/code/src/com/redhat/rhn/taskomatic/task/errata/ErrataCacheWorker.java | 4 rel-eng/lib/spacewalk/releng/builder.py | 2 rel-eng/packages/spacewalk-backend | 2 spacewalk/setup/bin/spacewalk-setup-jabberd | 16 +++ 14 files changed, 111 insertions(+), 33 deletions(-) ---

1 0

3 commits - backend/common backend/spacewalk-backend.spec rel-eng/packages
by Michael Mraka 04 Sep '09

04 Sep '09

backend/common/spacewalk-cfg-get | 13 +++++++++---- backend/spacewalk-backend.spec | 5 ++++- rel-eng/packages/spacewalk-backend | 2 +- 3 files changed, 14 insertions(+), 6 deletions(-) New commits: commit cd60ea3411ea74683220b0d9f7ef3dd4457ec8c4 Author: Michael Mraka <michael.mraka(a)redhat.com> Date: Fri Sep 4 09:43:33 2009 +0200 Automatic commit of package [spacewalk-backend] release [0.7.4-1]. diff --git a/backend/spacewalk-backend.spec b/backend/spacewalk-backend.spec index 62ddb2a..59f83a0 100644 --- a/backend/spacewalk-backend.spec +++ b/backend/spacewalk-backend.spec @@ -7,7 +7,7 @@ Name: spacewalk-backend Summary: Common programs needed to be installed on the Spacewalk servers/proxies Group: Applications/Internet License: GPLv2 -Version: 0.7.3 +Version: 0.7.4 Release: 1%{?dist} URL: https://fedorahosted.org/spacewalk Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz @@ -579,6 +579,9 @@ rm -f %{rhnconf}/rhnSecret.py* # $Id$ %changelog +* Fri Sep 04 2009 Michael Mraka <michael.mraka(a)redhat.com> 0.7.4-1 +- fixed output of multivalue variables in spacewalk-cfg-get + * Tue Sep 01 2009 Michael Mraka <michael.mraka(a)redhat.com> 0.7.3-1 - 494813 - print error message instead of traceback - postgresql dependency moved to spacewalk-postgresql diff --git a/rel-eng/packages/spacewalk-backend b/rel-eng/packages/spacewalk-backend index 1d05277..44d22f3 100644 --- a/rel-eng/packages/spacewalk-backend +++ b/rel-eng/packages/spacewalk-backend @@ -1 +1 @@ -0.7.3-1 backend/ +0.7.4-1 backend/ commit 42f96d13878d6ae1a15eb4414c347e0ccbc8078d Author: Michael Mraka <michael.mraka(a)redhat.com> Date: Fri Sep 4 09:41:15 2009 +0200 don't use keyword as a variable name diff --git a/backend/common/spacewalk-cfg-get b/backend/common/spacewalk-cfg-get index 61ad106..9099836 100644 --- a/backend/common/spacewalk-cfg-get +++ b/backend/common/spacewalk-cfg-get @@ -5,13 +5,13 @@ sys.path.append("/usr/share/rhn") from common.rhnConfig import RHNOptions -list=0 +do_list=0 if len(sys.argv) == 4 and sys.argv[1] == "get": comp = sys.argv[2] key = sys.argv[3] elif len(sys.argv) == 3 and sys.argv[1] == "list": comp = sys.argv[2] - list = 1 + do_list = 1 elif len(sys.argv) == 2: # assume we want key from root comp = '' @@ -24,7 +24,7 @@ else: cfg = RHNOptions(comp) cfg.parse() -if list: +if do_list: cfg.show() else: val = cfg.get(key) commit 81437c1952340801f53cd705a99bc7984e2cec11 Author: Michael Mraka <michael.mraka(a)redhat.com> Date: Fri Sep 4 09:40:15 2009 +0200 fixed output of multivalue variables (lists) diff --git a/backend/common/spacewalk-cfg-get b/backend/common/spacewalk-cfg-get index 2b2bde1..61ad106 100644 --- a/backend/common/spacewalk-cfg-get +++ b/backend/common/spacewalk-cfg-get @@ -27,5 +27,10 @@ cfg.parse() if list: cfg.show() else: - print cfg.get(key) + val = cfg.get(key) + if isinstance(val, list): + for i in val: + print i + else: + print val

1 0

java/code
by Partha Aji 03 Sep '09

03 Sep '09

java/code/src/com/redhat/rhn/common/hibernate/ConnectionManager.java | 42 +++++++++- 1 file changed, 39 insertions(+), 3 deletions(-) New commits: commit 1b835844ef74f92993268295236cc20e4b765b8d Author: Partha Aji <paji(a)redhat.com> Date: Thu Sep 3 11:59:29 2009 -0400 Made hibernate configs use new configs. So got tired of duplicating db information twice in the rhn.conf.. So added code in Connection manager to use db_port, db_host, db_sid etc diff --git a/java/code/src/com/redhat/rhn/common/hibernate/ConnectionManager.java b/java/code/src/com/redhat/rhn/common/hibernate/ConnectionManager.java index b5a156b..0cd7137 100644 --- a/java/code/src/com/redhat/rhn/common/hibernate/ConnectionManager.java +++ b/java/code/src/com/redhat/rhn/common/hibernate/ConnectionManager.java @@ -41,6 +41,13 @@ class ConnectionManager { private static final Logger LOG = Logger.getLogger(ConnectionManager.class); private static final String[] PACKAGE_NAMES = {"com.redhat.rhn.domain"}; + private static final String HIBERNATE_USERNAME = "hibernate.connection.username"; + private static final String HIBERNATE_PASSWORD = "hibernate.connection.password"; + private static final String HIBERNATE_URL = "hibernate.connection.url"; + private static final String ORACLE_JDBC_URL_FORMAT = "jdbc:oracle:thin:@%s:%s:%s"; + private static final String HIBERNATE_DRIVER_CLASS = + "hibernate.connection.driver_class"; + private static final String ORACLE_DRIVER = "oracle.jdbc.driver.OracleDriver"; private List configurators = new LinkedList(); private SessionFactory sessionFactory; @@ -52,7 +59,9 @@ class ConnectionManager { } }; - + private boolean isOracle() { + return "oracle".equals(Config.get().getString("db_backend")); + } /** * Register a class with HibernateFactory, to give the registered class a @@ -146,8 +155,7 @@ class ConnectionManager { * hibernate.* */ LOG.info("Adding hibernate properties to hibernate Configuration"); - Properties hibProperties = Config.get().getNamespaceProperties( - "hibernate"); + Properties hibProperties = setupHibernateProps(); config.addProperties(hibProperties); // Force the use of our txn factory if (config.getProperty(Environment.TRANSACTION_STRATEGY) != null) { @@ -177,6 +185,34 @@ class ConnectionManager { } } + private Properties setupHibernateProps() { + Properties hibProperties = Config.get().getNamespaceProperties( + "hibernate"); + + if (!hibProperties.contains(HIBERNATE_USERNAME)) { + hibProperties.put(HIBERNATE_USERNAME, + Config.get().getString("db_user")); + } + if (!hibProperties.contains(HIBERNATE_PASSWORD)) { + hibProperties.put(HIBERNATE_PASSWORD, + Config.get().getString("db_password")); + } + + if (!hibProperties.contains(HIBERNATE_URL) && isOracle()) { + //jdbc:oracle:thin:@hostname:<;listener-port>:<SID> + String url = String.format(ORACLE_JDBC_URL_FORMAT, + Config.get().getString("db_host"), + Config.get().getString("db_port"), + Config.get().getString("db_name")); + hibProperties.put(HIBERNATE_URL, url); + } + + if (!hibProperties.contains(HIBERNATE_DRIVER_CLASS) && isOracle()) { + hibProperties.put(HIBERNATE_DRIVER_CLASS, ORACLE_DRIVER); + } + return hibProperties; + } + private SessionInfo threadSessionInfo() { return (SessionInfo) SESSION_TLS.get(); }

1 0

4 commits - client/rhel rel-eng/lib
by Miroslav Suchý 03 Sep '09

03 Sep '09

client/rhel/yum-rhn-plugin/Makefile.yum-rhn-plugin | 2 +- client/rhel/yum-rhn-plugin/yum-rhn-plugin.spec | 15 ++++++++------- rel-eng/lib/spacewalk/releng/builder.py | 2 +- 3 files changed, 10 insertions(+), 9 deletions(-) New commits: commit 99bc67aaa8db1168106d0816fb4b88edb3b9f698 Author: Miroslav Suchý <msuchy(a)redhat.com> Date: Thu Sep 3 15:47:06 2009 +0200 add .tar.bz2 to known suffixes diff --git a/rel-eng/lib/spacewalk/releng/builder.py b/rel-eng/lib/spacewalk/releng/builder.py index 8fe6e39..52c773e 100644 --- a/rel-eng/lib/spacewalk/releng/builder.py +++ b/rel-eng/lib/spacewalk/releng/builder.py @@ -637,7 +637,7 @@ class NoTgzBuilder(Builder): self._setup_sources() self.ran_tgz = True - source_suffixes = ('.tar.gz', '.tar', '.zip', '.jar') + source_suffixes = ('.tar.gz', '.tar', '.zip', '.jar', '.tar.bz2') debug("Scanning for sources.") for filename in os.listdir(self.rpmbuild_gitcopy): for suffix in source_suffixes: commit 436aba034150dd7558f29d25e2b843f027fecf61 Author: Miroslav Suchý <msuchy(a)redhat.com> Date: Wed Sep 2 15:21:25 2009 +0200 use macros in spec file diff --git a/client/rhel/yum-rhn-plugin/yum-rhn-plugin.spec b/client/rhel/yum-rhn-plugin/yum-rhn-plugin.spec index a59b154..f18d161 100644 --- a/client/rhel/yum-rhn-plugin/yum-rhn-plugin.spec +++ b/client/rhel/yum-rhn-plugin/yum-rhn-plugin.spec @@ -55,9 +55,9 @@ make -f Makefile.yum-rhn-plugin install VERSION=%{version}-%{release} PREFIX=$RP %{_datadir}/yum-plugins/rhnplugin.pyc %{_datadir}/yum-plugins/rhnplugin.pyo -/usr/share/rhn/actions/packages.py -/usr/share/rhn/actions/packages.pyc -/usr/share/rhn/actions/packages.pyo +%{_datadir}/rhn/actions/packages.py +%{_datadir}/rhn/actions/packages.pyc +%{_datadir}/rhn/actions/packages.pyo %changelog commit 97f0905d801e66fbd44d92ceba39e87e05c47087 Author: Miroslav Suchý <msuchy(a)redhat.com> Date: Wed Sep 2 15:24:17 2009 +0200 move rhnplugin from /var/lib/yum-plugins to /usr/share/yum-plugins - it is not executable addressing rpmlint error diff --git a/client/rhel/yum-rhn-plugin/Makefile.yum-rhn-plugin b/client/rhel/yum-rhn-plugin/Makefile.yum-rhn-plugin index da60f84..d4a8de6 100644 --- a/client/rhel/yum-rhn-plugin/Makefile.yum-rhn-plugin +++ b/client/rhel/yum-rhn-plugin/Makefile.yum-rhn-plugin @@ -2,7 +2,7 @@ PREFIX ?= / SYSCONF ?= etc PYTHON ?= python -PKGDIR = /usr/lib/yum-plugins/ +PKGDIR = /usr/share/yum-plugins/ PKGNAME = yum-rhn-plugin VERSION = $(shell echo `grep ^Version: $(PKGNAME).spec | awk '{ print $$2 }'`) diff --git a/client/rhel/yum-rhn-plugin/yum-rhn-plugin.spec b/client/rhel/yum-rhn-plugin/yum-rhn-plugin.spec index 4c44fcc..a59b154 100644 --- a/client/rhel/yum-rhn-plugin/yum-rhn-plugin.spec +++ b/client/rhel/yum-rhn-plugin/yum-rhn-plugin.spec @@ -51,9 +51,9 @@ make -f Makefile.yum-rhn-plugin install VERSION=%{version}-%{release} PREFIX=$RP %{_mandir}/man8/rhnplugin.8* %{_mandir}/man8/yum-rhn-plugin.8* -/usr/lib/yum-plugins/rhnplugin.py -/usr/lib/yum-plugins/rhnplugin.pyc -/usr/lib/yum-plugins/rhnplugin.pyo +%{_datadir}/yum-plugins/rhnplugin.py +%{_datadir}/yum-plugins/rhnplugin.pyc +%{_datadir}/yum-plugins/rhnplugin.pyo /usr/share/rhn/actions/packages.py /usr/share/rhn/actions/packages.pyc commit d79632500b084d1ee83111e13098a100993584aa Author: Miroslav Suchý <msuchy(a)redhat.com> Date: Wed Sep 2 14:36:51 2009 +0200 versioned obsolete and provide the obsolete package diff --git a/client/rhel/yum-rhn-plugin/yum-rhn-plugin.spec b/client/rhel/yum-rhn-plugin/yum-rhn-plugin.spec index 7953c21..4c44fcc 100644 --- a/client/rhel/yum-rhn-plugin/yum-rhn-plugin.spec +++ b/client/rhel/yum-rhn-plugin/yum-rhn-plugin.spec @@ -19,7 +19,8 @@ Requires: m2crypto >= 0.16-6 # Not really, but for upgrades we need these Requires: rhn-setup -Obsoletes: up2date +Obsoletes: up2date < 5.0.0 +Provides: up2date = %{version} %description This yum plugin provides support for yum to access a Red Hat Network server for

1 0

← Newer
1
...
5
6
7
8
9
10
11
12
13
Older →

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

spacewalk-commits September 2009