Changes to 'refs/tags/oracle-lib-compat-11.2.0.5-1'
by Jan Pazdziora
Tag 'oracle-lib-compat-11.2.0.5-1' created by Jan Pazdziora <jpazdziora(a)redhat.com> at 2011-05-16 12:07 +0000
Tagging package [oracle-lib-compat] version [11.2.0.5-1] in directory [projects/oracle-lib-compat/].
Changes since spacewalk-web-1.5.9-1:
Jan Pazdziora (2):
Both tomcat5 and tomcat6 which needs the LD_PRELOAD set.
Automatic commit of package [oracle-lib-compat] release [11.2.0.5-1].
---
projects/oracle-lib-compat/oracle-lib-compat.spec | 5 ++++-
projects/oracle-lib-compat/tomcat-setenv.sh | 2 +-
rel-eng/packages/oracle-lib-compat | 2 +-
3 files changed, 6 insertions(+), 3 deletions(-)
---
12 years, 11 months
2 commits - projects/oracle-lib-compat rel-eng/packages
by Jan Pazdziora
projects/oracle-lib-compat/oracle-lib-compat.spec | 5 ++++-
projects/oracle-lib-compat/tomcat-setenv.sh | 2 +-
rel-eng/packages/oracle-lib-compat | 2 +-
3 files changed, 6 insertions(+), 3 deletions(-)
New commits:
commit bab6c3960bfff5a7faad8d28a78be7bc0dc83ac8
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Mon May 16 14:07:48 2011 +0200
Automatic commit of package [oracle-lib-compat] release [11.2.0.5-1].
diff --git a/projects/oracle-lib-compat/oracle-lib-compat.spec b/projects/oracle-lib-compat/oracle-lib-compat.spec
index 82dc01b..b118cdf 100644
--- a/projects/oracle-lib-compat/oracle-lib-compat.spec
+++ b/projects/oracle-lib-compat/oracle-lib-compat.spec
@@ -1,5 +1,5 @@
Name: oracle-lib-compat
-Version: 11.2.0.4
+Version: 11.2.0.5
Release: 1%{?dist}
Summary: Compatibility package so that perl-DBD-Oracle will install
Group: Applications/Multimedia
@@ -115,6 +115,9 @@ find %{_prefix}/lib/oracle/%{icdir} \
| xargs execstack -c
%changelog
+* Mon May 16 2011 Jan Pazdziora 11.2.0.5-1
+- Both tomcat5 and tomcat6 which needs the LD_PRELOAD set.
+
* Wed May 04 2011 Jan Pazdziora 11.2.0.4-1
- We unset LD_PRELOAD to force ldd to show the libldap line with => even if
LD_PRELOAD was already set.
diff --git a/rel-eng/packages/oracle-lib-compat b/rel-eng/packages/oracle-lib-compat
index bb21bea..1116db0 100644
--- a/rel-eng/packages/oracle-lib-compat
+++ b/rel-eng/packages/oracle-lib-compat
@@ -1 +1 @@
-11.2.0.4-1 projects/oracle-lib-compat/
+11.2.0.5-1 projects/oracle-lib-compat/
commit 674f5f5df6af1fd9cc419895496df4a720397c41
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Mon May 16 14:06:18 2011 +0200
Both tomcat5 and tomcat6 which needs the LD_PRELOAD set.
Albeit with tomcat6 it only seems to be needed on s390x, not on Intel
platforms.
diff --git a/projects/oracle-lib-compat/tomcat-setenv.sh b/projects/oracle-lib-compat/tomcat-setenv.sh
index ee14820..0e29f49 100644
--- a/projects/oracle-lib-compat/tomcat-setenv.sh
+++ b/projects/oracle-lib-compat/tomcat-setenv.sh
@@ -1,6 +1,6 @@
# To address bug 623115/627859, we need to override the ldap_* symbols
-# in libclntsh.so* upon tomcat5 startup with those from standard library.
+# in libclntsh.so* upon tomcat* startup with those from standard library.
for i in /lib64/security/pam_ldap.so /lib/security/pam_ldap.so ; do
if [ -f $i ] ; then
# to force ldd to show the libldap line with => even if LD_PRELOAD was already set
12 years, 11 months
Changes to 'refs/tags/spacewalk-web-1.5.9-1'
by Miroslav Suchý
Tag 'spacewalk-web-1.5.9-1' created by Miroslav Suchý <msuchy(a)redhat.com> at 2011-05-16 11:57 +0000
Tagging package [spacewalk-web] version [1.5.9-1] in directory [web/].
Changes since spacewalk-setup-1.5.6-1:
Miroslav Suchý (2):
file /var/www/html/.htaccess has been removed
Automatic commit of package [spacewalk-web] release [1.5.9-1].
---
rel-eng/packages/spacewalk-web | 2 +-
web/spacewalk-web.spec | 6 ++++--
2 files changed, 5 insertions(+), 3 deletions(-)
---
12 years, 11 months
2 commits - rel-eng/packages web/spacewalk-web.spec
by Miroslav Suchý
rel-eng/packages/spacewalk-web | 2 +-
web/spacewalk-web.spec | 6 ++++--
2 files changed, 5 insertions(+), 3 deletions(-)
New commits:
commit 2b088e82f873087e471c79f445a4c13599a3c9a1
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Mon May 16 13:57:34 2011 +0200
Automatic commit of package [spacewalk-web] release [1.5.9-1].
diff --git a/rel-eng/packages/spacewalk-web b/rel-eng/packages/spacewalk-web
index 67d3476..67c69c3 100644
--- a/rel-eng/packages/spacewalk-web
+++ b/rel-eng/packages/spacewalk-web
@@ -1 +1 @@
-1.5.8-1 web/
+1.5.9-1 web/
diff --git a/web/spacewalk-web.spec b/web/spacewalk-web.spec
index 087db2d..3164f77 100644
--- a/web/spacewalk-web.spec
+++ b/web/spacewalk-web.spec
@@ -2,7 +2,7 @@ Name: spacewalk-web
Summary: Spacewalk Web site packages
Group: Applications/Internet
License: GPLv2
-Version: 1.5.8
+Version: 1.5.9
Release: 1%{?dist}
URL: https://fedorahosted.org/spacewalk
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
@@ -256,6 +256,9 @@ rm -rf $RPM_BUILD_ROOT
# $Id$
%changelog
+* Mon May 16 2011 Miroslav Suchý 1.5.9-1
+- cleanup - removing old files, and unused sections in .htaccess
+
* Tue May 10 2011 Jan Pazdziora 1.5.8-1
- Fix remote command schedule date on postgresql (Ville.Salmela(a)csc.fi)
commit 770a258ececcfe526da9b6c37100a35e5954776a
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Mon May 16 13:56:07 2011 +0200
file /var/www/html/.htaccess has been removed
diff --git a/web/spacewalk-web.spec b/web/spacewalk-web.spec
index 32230ef..087db2d 100644
--- a/web/spacewalk-web.spec
+++ b/web/spacewalk-web.spec
@@ -253,7 +253,6 @@ rm -rf $RPM_BUILD_ROOT
%files -n spacewalk-html
%defattr(644,root,root,755)
%{_var}/www/html/*
-%{_var}/www/html/.htaccess
# $Id$
%changelog
12 years, 11 months
Changes to 'refs/tags/spacewalk-setup-1.5.6-1'
by Jan Pazdziora
Tag 'spacewalk-setup-1.5.6-1' created by Jan Pazdziora <jpazdziora(a)redhat.com> at 2011-05-16 11:55 +0000
Tagging package [spacewalk-setup] version [1.5.6-1] in directory [spacewalk/setup/].
Changes since spacewalk-backend-1.5.22-1:
Jan Pazdziora (2):
We only want to source the setenv.sh if it exists.
Automatic commit of package [spacewalk-setup] release [1.5.6-1].
Miroslav Suchý (9):
cleanup - page admin_group_list.pxt is not used any more
cleanup - page target_group_list.pxt is not used any more
cleanup - page update_confirm.pxt is not used any more
cleanup - page namespaces.pxt is not used any more
cleanup - page probe_list is not used any more
cleanup - page downloads.pxt is not used any more and having empty section does not make sense either
cleanup - page users.pxt is not used any more
cleanup - page list is not used any more
cleanup - page errata is not used any more
---
rel-eng/packages/spacewalk-setup | 2 -
spacewalk/setup/share/tomcatX.conf.3 | 2 -
spacewalk/setup/spacewalk-setup.spec | 5 ++-
web/html/.htaccess | 6 ----
web/html/network/errata/manage/.htaccess | 7 ----
web/html/network/monitoring/.htaccess | 7 ----
web/html/network/software/channels/.htaccess | 3 --
web/html/network/software/channels/manage/.htaccess | 4 --
web/html/network/systems/details/.htaccess | 30 --------------------
web/html/network/systems/ssm/provisioning/.htaccess | 10 ------
10 files changed, 6 insertions(+), 70 deletions(-)
---
12 years, 11 months
rel-eng/packages spacewalk/setup
by Jan Pazdziora
rel-eng/packages/spacewalk-setup | 2 +-
spacewalk/setup/spacewalk-setup.spec | 5 ++++-
2 files changed, 5 insertions(+), 2 deletions(-)
New commits:
commit c90d359483c0625c0dacee28fd927aa255745c40
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Mon May 16 13:55:11 2011 +0200
Automatic commit of package [spacewalk-setup] release [1.5.6-1].
diff --git a/rel-eng/packages/spacewalk-setup b/rel-eng/packages/spacewalk-setup
index cd5b824..71c1ea4 100644
--- a/rel-eng/packages/spacewalk-setup
+++ b/rel-eng/packages/spacewalk-setup
@@ -1 +1 @@
-1.5.5-1 spacewalk/setup/
+1.5.6-1 spacewalk/setup/
diff --git a/spacewalk/setup/spacewalk-setup.spec b/spacewalk/setup/spacewalk-setup.spec
index c762e0e..3138c8b 100644
--- a/spacewalk/setup/spacewalk-setup.spec
+++ b/spacewalk/setup/spacewalk-setup.spec
@@ -1,5 +1,5 @@
Name: spacewalk-setup
-Version: 1.5.5
+Version: 1.5.6
Release: 1%{?dist}
Summary: Initial setup tools for Red Hat Spacewalk
@@ -102,6 +102,9 @@ rm -rf %{buildroot}
%attr(755, apache, root) %{_var}/spacewalk
%changelog
+* Mon May 16 2011 Jan Pazdziora 1.5.6-1
+- We only want to source the setenv.sh if it exists.
+
* Wed May 11 2011 Jan Pazdziora 1.5.5-1
- Actually package the new tomcatX.conf.3 (for the tomcat6 setenv.sh issue) in
the rpm.
12 years, 11 months
spacewalk/setup
by Jan Pazdziora
spacewalk/setup/share/tomcatX.conf.3 | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 2f25ae8bd221204751ce5b9a4e08641c34fdf6d5
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Mon May 16 13:50:33 2011 +0200
We only want to source the setenv.sh if it exists.
Addressing
/etc/tomcat6/tomcat6.conf: line 58: /usr/share/tomcat6/bin/setenv.sh: No such file or directory
diff --git a/spacewalk/setup/share/tomcatX.conf.3 b/spacewalk/setup/share/tomcatX.conf.3
index 6269ee7..aba1bdf 100644
--- a/spacewalk/setup/share/tomcatX.conf.3
+++ b/spacewalk/setup/share/tomcatX.conf.3
@@ -1,2 +1,2 @@
^_HACK_AROUND_PARSEOPTIONS=1.+setenv\.sh\n
-_HACK_AROUND_PARSEOPTIONS=1 ; . $CATALINA_HOME/bin/setenv.sh
+_HACK_AROUND_PARSEOPTIONS=1 ; test -f $CATALINA_HOME/bin/setenv.sh && . $CATALINA_HOME/bin/setenv.sh
12 years, 11 months
9 commits - web/html
by Miroslav Suchý
web/html/.htaccess | 6 ----
web/html/network/errata/manage/.htaccess | 7 ----
web/html/network/monitoring/.htaccess | 7 ----
web/html/network/software/channels/.htaccess | 3 --
web/html/network/software/channels/manage/.htaccess | 4 --
web/html/network/systems/details/.htaccess | 30 --------------------
web/html/network/systems/ssm/provisioning/.htaccess | 10 ------
7 files changed, 67 deletions(-)
New commits:
commit 3609b6c3f93b915246ed815af701af96e690ee88
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Mon May 16 13:46:56 2011 +0200
cleanup - page errata is not used any more
diff --git a/web/html/.htaccess b/web/html/.htaccess
deleted file mode 100644
index 9d7a845..0000000
--- a/web/html/.htaccess
+++ /dev/null
@@ -1,6 +0,0 @@
-<Files errata>
- ForceType text/pxt
- SetHandler perl-script
- PerlModule PXT::ApacheHandler
- PerlHandler PXT::ApacheHandler
-</Files>
commit 8978b8420b6aab511dcabac574dcddae0711c28f
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Mon May 16 13:45:28 2011 +0200
cleanup - page list is not used any more
diff --git a/web/html/network/errata/manage/.htaccess b/web/html/network/errata/manage/.htaccess
index 8cc2651..304f6f5 100644
--- a/web/html/network/errata/manage/.htaccess
+++ b/web/html/network/errata/manage/.htaccess
@@ -7,10 +7,3 @@ PerlAuthenHandler PXT::ApacheAuth
require acl user_role(channel_admin)
PerlSetVar errata_context manage
-
-<Files list>
- ForceType text/pxt
- SetHandler perl-script
- PerlModule PXT::ApacheHandler
- PerlHandler PXT::ApacheHandler
-</Files>
commit db743e5374a743ab4435c396ef5220e0ad638053
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Mon May 16 13:42:05 2011 +0200
cleanup - page users.pxt is not used any more
diff --git a/web/html/network/software/channels/manage/.htaccess b/web/html/network/software/channels/manage/.htaccess
index 0392eca..7f741b8 100644
--- a/web/html/network/software/channels/manage/.htaccess
+++ b/web/html/network/software/channels/manage/.htaccess
@@ -6,8 +6,4 @@ PerlModule PXT::ApacheAuth
PerlAuthenHandler PXT::ApacheAuth
require acl user_can_manage_channels()
-<Files users.pxt>
-require acl mixin RHN::Access::Channel user_role(channel_admin)
-</Files>
-
PerlSetVar channel_context manage
commit 8ba9393324eedf3ca888785aeadebdd914d952ee
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Mon May 16 13:40:49 2011 +0200
cleanup - page downloads.pxt is not used any more and having empty section does not make sense either
diff --git a/web/html/network/software/channels/.htaccess b/web/html/network/software/channels/.htaccess
index be7f2bb..a34cdbd 100644
--- a/web/html/network/software/channels/.htaccess
+++ b/web/html/network/software/channels/.htaccess
@@ -5,9 +5,6 @@ PerlModule PXT::ApacheHandler
PerlModule PXT::ApacheAuth
PerlAuthenHandler PXT::ApacheAuth
-<Files downloads.pxt>
-</Files>
-
<Files subscribers.pxt>
require acl mixin RHN::Access::Channel org_entitlement(sw_mgr_enterprise);org_channel_setting(not_globally_subscribable);user_role(channel_admin) or user_can_admin_channel()
</Files>
commit 33425bc3b5b428b8c00ec66582f194891a485350
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Mon May 16 13:39:20 2011 +0200
cleanup - page probe_list is not used any more
diff --git a/web/html/network/monitoring/.htaccess b/web/html/network/monitoring/.htaccess
index 305693a..6892bf6 100644
--- a/web/html/network/monitoring/.htaccess
+++ b/web/html/network/monitoring/.htaccess
@@ -4,10 +4,3 @@ AuthName "RHN Monitoring Area"
PerlModule PXT::ApacheHandler
PerlModule PXT::ApacheAuth
PerlAuthenHandler PXT::ApacheAuth
-
-<Files probe_list>
- ForceType text/pxt
- SetHandler perl-script
- PerlModule PXT::ApacheHandler
- PerlHandler PXT::ApacheHandler
-</Files>
commit 0439d4e5f18889e497af7816eb4fed75ff721aeb
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Mon May 16 13:37:10 2011 +0200
cleanup - page namespaces.pxt is not used any more
diff --git a/web/html/network/systems/ssm/provisioning/.htaccess b/web/html/network/systems/ssm/provisioning/.htaccess
index ee5b727..d7c6b76 100644
--- a/web/html/network/systems/ssm/provisioning/.htaccess
+++ b/web/html/network/systems/ssm/provisioning/.htaccess
@@ -5,13 +5,3 @@ PerlModule PXT::ApacheHandler
PerlModule PXT::ApacheAuth
PerlAuthenHandler PXT::ApacheAuth
require acl org_entitlement(rhn_provisioning)
-
-<Files namespaces.pxt>
- ForceType text/pxt
- SetHandler perl-script
- PerlModule PXT::ApacheHandler
- PerlHandler PXT::ApacheHandler
-
- require acl mixin RHN::Access::System user_role(config_admin)
-</Files>
-
commit e6b14beba11ed00d44c35baedf97027b2843abb6
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Mon May 16 13:33:32 2011 +0200
cleanup - page update_confirm.pxt is not used any more
diff --git a/web/html/network/systems/details/.htaccess b/web/html/network/systems/details/.htaccess
index 74801db..a815dcf 100644
--- a/web/html/network/systems/details/.htaccess
+++ b/web/html/network/systems/details/.htaccess
@@ -18,18 +18,6 @@
require acl system_feature(ftr_agent_smith)
</Files>
-
-<Files update_confirm.pxt>
- AuthType Basic
- AuthName "RHN Org Admin Area"
-
- PerlModule PXT::ApacheHandler
- PerlModule PXT::ApacheAuth
- PerlAuthenHandler PXT::ApacheAuth
-
- require acl system_feature(ftr_package_updates)
-</Files>
-
<Files remote_commands.pxt>
AuthType Basic
AuthName "RHN Org Admin Area"
commit aac77c739fe6ed890fb0abca6f97e0a8d598a6ea
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Mon May 16 13:32:59 2011 +0200
cleanup - page target_group_list.pxt is not used any more
diff --git a/web/html/network/systems/details/.htaccess b/web/html/network/systems/details/.htaccess
index 269d088..74801db 100644
--- a/web/html/network/systems/details/.htaccess
+++ b/web/html/network/systems/details/.htaccess
@@ -7,15 +7,6 @@
require acl mixin RHN::Access::System user_role(org_admin); system_feature(ftr_proxy_capable); org_channel_family(rhn-proxy); child_channel_candidate(rhn-proxy)
</Files>
-<Files target_group_list.pxt>
- ForceType text/pxt
- SetHandler perl-script
- PerlModule PXT::ApacheHandler
- PerlHandler PXT::ApacheHandler
-
- require acl user_role(org_admin) or user_role(system_group_admin); system_feature(ftr_system_grouping)
-</Files>
-
<Files activation.pxt>
AuthType Basic
AuthName "RHN Org Admin Area"
commit 63234a65111b218ce4cd9aa4e8462d4e11ef6134
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Mon May 16 13:32:28 2011 +0200
cleanup - page admin_group_list.pxt is not used any more
diff --git a/web/html/network/systems/details/.htaccess b/web/html/network/systems/details/.htaccess
index 0d714c9..269d088 100644
--- a/web/html/network/systems/details/.htaccess
+++ b/web/html/network/systems/details/.htaccess
@@ -7,15 +7,6 @@
require acl mixin RHN::Access::System user_role(org_admin); system_feature(ftr_proxy_capable); org_channel_family(rhn-proxy); child_channel_candidate(rhn-proxy)
</Files>
-<Files admin_group_list.pxt>
- ForceType text/pxt
- SetHandler perl-script
- PerlModule PXT::ApacheHandler
- PerlHandler PXT::ApacheHandler
-
- require acl user_role(org_admin) or user_role(system_group_admin); system_feature(ftr_system_grouping)
-</Files>
-
<Files target_group_list.pxt>
ForceType text/pxt
SetHandler perl-script
12 years, 11 months
Changes to 'refs/tags/spacewalk-backend-1.5.22-1'
by mcalmer
Tag 'spacewalk-backend-1.5.22-1' created by Michael Calmer <mc(a)suse.de> at 2011-05-16 11:36 +0000
Tagging package [spacewalk-backend] version [1.5.22-1] in directory [backend/].
Changes since perl-NOCpulse-Probe-1.184.8-1:
Michael Calmer (6):
fix encoding of package summary and description
use fix_encoding method
test if checksum_type exists before accessing it
inherit from DependencyItem like other dep classes
fix sql statements for weak deps (pg)
Automatic commit of package [spacewalk-backend] release [1.5.22-1].
---
backend/satellite_tools/satsync.py | 2 +-
backend/satellite_tools/xmlSource.py | 18 +++---------------
backend/server/importlib/packageImport.py | 16 ++++++++++++----
backend/spacewalk-backend.spec | 8 +++++++-
rel-eng/packages/spacewalk-backend | 2 +-
web/modules/rhn/RHN/DB/Package.pm | 12 ++++++------
6 files changed, 30 insertions(+), 28 deletions(-)
---
12 years, 11 months
6 commits - backend/satellite_tools backend/server backend/spacewalk-backend.spec rel-eng/packages web/modules
by mcalmer
backend/satellite_tools/satsync.py | 2 +-
backend/satellite_tools/xmlSource.py | 18 +++---------------
backend/server/importlib/packageImport.py | 16 ++++++++++++----
backend/spacewalk-backend.spec | 8 +++++++-
rel-eng/packages/spacewalk-backend | 2 +-
web/modules/rhn/RHN/DB/Package.pm | 12 ++++++------
6 files changed, 30 insertions(+), 28 deletions(-)
New commits:
commit f3788cfcdc25348e9dbb9dfca5665eef8d71aae9
Author: Michael Calmer <mc(a)suse.de>
Date: Mon May 16 13:36:02 2011 +0200
Automatic commit of package [spacewalk-backend] release [1.5.22-1].
diff --git a/backend/spacewalk-backend.spec b/backend/spacewalk-backend.spec
index 981e1b5..cf7a389 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.5.21
+Version: 1.5.22
Release: 1%{?dist}
URL: https://fedorahosted.org/spacewalk
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
@@ -682,6 +682,12 @@ rm -f %{rhnconf}/rhnSecret.py*
# $Id$
%changelog
+* Mon May 16 2011 Michael Calmer <mc(a)suse.de> 1.5.22-1
+- inherit from DependencyItem like other dep classes (mc(a)suse.de)
+- test if checksum_type exists before accessing it (mc(a)suse.de)
+- use fix_encoding method (mc(a)suse.de)
+- fix encoding of package summary and description (mc(a)suse.de)
+
* Fri May 13 2011 Jan Pazdziora 1.5.21-1
- 698567 - give the transaction that we have to use to read the file header a
sandbox database.
diff --git a/rel-eng/packages/spacewalk-backend b/rel-eng/packages/spacewalk-backend
index 47e1d59..3094a45 100644
--- a/rel-eng/packages/spacewalk-backend
+++ b/rel-eng/packages/spacewalk-backend
@@ -1 +1 @@
-1.5.21-1 backend/
+1.5.22-1 backend/
commit 782f998314808b99a0dfc8502f7d6234665557c7
Author: Michael Calmer <mc(a)suse.de>
Date: Sat May 7 19:59:04 2011 +0200
fix sql statements for weak deps (pg)
diff --git a/web/modules/rhn/RHN/DB/Package.pm b/web/modules/rhn/RHN/DB/Package.pm
index 72de143..604a822 100644
--- a/web/modules/rhn/RHN/DB/Package.pm
+++ b/web/modules/rhn/RHN/DB/Package.pm
@@ -351,11 +351,11 @@ sub recommends {
my $sth;
$query = <<EOQ;
-SELECT DISTINCT C.name, C.version, P.sense
+SELECT DISTINCT C.name, C.version, P.sense, UPPER(C.name) AS name_upper
FROM rhnPackageCapability C, rhnPackageRecommends P
WHERE P.package_id = ?
AND P.capability_id = C.id
-ORDER BY UPPER(C.name), C.version
+ORDER BY name_upper, C.version
EOQ
$sth = $dbh->prepare($query);
@@ -378,11 +378,11 @@ sub suggests {
my $sth;
$query = <<EOQ;
-SELECT DISTINCT C.name, C.version, P.sense
+SELECT DISTINCT C.name, C.version, P.sense, UPPER(C.name) AS name_upper
FROM rhnPackageCapability C, rhnPackageSuggests P
WHERE P.package_id = ?
AND P.capability_id = C.id
-ORDER BY UPPER(C.name), C.version
+ORDER BY name_upper, C.version
EOQ
$sth = $dbh->prepare($query);
@@ -405,11 +405,11 @@ sub supplements {
my $sth;
$query = <<EOQ;
-SELECT DISTINCT C.name, C.version, P.sense
+SELECT DISTINCT C.name, C.version, P.sense, UPPER(C.name) AS name_upper
FROM rhnPackageCapability C, rhnPackageSupplements P
WHERE P.package_id = ?
AND P.capability_id = C.id
-ORDER BY UPPER(C.name), C.version
+ORDER BY name_upper, C.version
EOQ
$sth = $dbh->prepare($query);
commit 958bc9a0532c6f2990d698ee476bca698beb85c8
Author: Michael Calmer <mc(a)suse.de>
Date: Sat May 14 16:16:01 2011 +0200
inherit from DependencyItem like other dep classes
diff --git a/backend/satellite_tools/xmlSource.py b/backend/satellite_tools/xmlSource.py
index 96ea786..cac68ba 100644
--- a/backend/satellite_tools/xmlSource.py
+++ b/backend/satellite_tools/xmlSource.py
@@ -615,28 +615,16 @@ class ObsoletesItem(DependencyItem):
item_name = 'rhn-package-obsoletes-entry'
addItem(ObsoletesItem)
-class RecommendsItem(BaseItem):
+class RecommendsItem(DependencyItem):
item_name = 'rhn-package-recommends-entry'
- item_class = importLib.Dependency
- tagMap = {
- 'sense' : 'flags',
- }
addItem(RecommendsItem)
-class SuggestsItem(BaseItem):
+class SuggestsItem(DependencyItem):
item_name = 'rhn-package-suggests-entry'
- item_class = importLib.Dependency
- tagMap = {
- 'sense' : 'flags',
- }
addItem(SuggestsItem)
-class SupplementsItem(BaseItem):
+class SupplementsItem(DependencyItem):
item_name = 'rhn-package-supplements-entry'
- item_class = importLib.Dependency
- tagMap = {
- 'sense' : 'flags',
- }
addItem(SupplementsItem)
class FileItem(BaseChecksummedItem):
commit 0b2ac9758708b27cd77f7e20fc70155d1ffc6fd8
Author: Michael Calmer <mc(a)suse.de>
Date: Sat May 7 19:58:16 2011 +0200
test if checksum_type exists before accessing it
diff --git a/backend/satellite_tools/satsync.py b/backend/satellite_tools/satsync.py
index 4dfaabe..1f101cd 100644
--- a/backend/satellite_tools/satsync.py
+++ b/backend/satellite_tools/satsync.py
@@ -909,7 +909,7 @@ Please contact your RHN representative""") % (generation, sat_cert.generation))
row = None
for r in (h.fetchall_dict() or []):
# let's check which checksum we have in database
- if package['checksums'][r['checksum_type']] == r['checksum']:
+ if r['checksum_type'] in package['checksums'] and package['checksums'][r['checksum_type']] == r['checksum']:
row = r
break
commit 13e96fb993ca377b0bdb47f5efc19c927e0f54ac
Author: Michael Calmer <mc(a)suse.de>
Date: Sat May 14 15:47:21 2011 +0200
use fix_encoding method
diff --git a/backend/server/importlib/packageImport.py b/backend/server/importlib/packageImport.py
index 355c20e..7432d1d 100644
--- a/backend/server/importlib/packageImport.py
+++ b/backend/server/importlib/packageImport.py
@@ -244,10 +244,7 @@ class PackageImport(ChannelPackageSubscription):
# Process files too
fileList = package['files']
for f in fileList:
- try:
- filename = f['name'].decode('utf8')
- except UnicodeDecodeError:
- filename = f['name'].decode('iso8859-1')
+ filename = self._fix_encoding(f['name'])
nv = (filename, '')
del f['name']
f['capability'] = nv
commit f87ac525931423fdeea2c4a4e593cc6ea0eaf26d
Author: Michael Calmer <mc(a)suse.de>
Date: Sun May 8 19:01:28 2011 +0200
fix encoding of package summary and description
diff --git a/backend/server/importlib/packageImport.py b/backend/server/importlib/packageImport.py
index c03db36..355c20e 100644
--- a/backend/server/importlib/packageImport.py
+++ b/backend/server/importlib/packageImport.py
@@ -274,6 +274,10 @@ class PackageImport(ChannelPackageSubscription):
else:
self.package_arches['i386-solaris-patch'] = None
+ # fix encoding issues in package summary and description
+ package['description'] = self._fix_encoding(package['description'])
+ package['summary'] = self._fix_encoding(package['summary'])
+
def fix(self):
# If capabilities are available, process them
if self.capabilities:
@@ -500,6 +504,13 @@ class PackageImport(ChannelPackageSubscription):
server_packages.processPackageKeyAssociations(header,
package['checksum_type'], package['checksum'])
+ def _fix_encoding(self, text):
+ try:
+ return text.decode('utf8')
+ except UnicodeDecodeError:
+ return text.decode('iso8859-1')
+
+
class SourcePackageImport(Import):
def __init__(self, batch, backend, caller=None, update_last_modified=0):
Import.__init__(self, batch, backend)
12 years, 11 months