backend/server/importlib/packageImport.py | 6 +++++-
rel-eng/packages/oracle-rhnsat-selinux | 2 +-
selinux/oracle-rhnsat-selinux/oracle-rhnsat-selinux.spec | 5 ++++-
selinux/oracle-rhnsat-selinux/oracle-rhnsat.fc | 2 +-
4 files changed, 11 insertions(+), 4 deletions(-)
New commits:
commit cdace50eb931a481b5822dff02507f340d986b54
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Wed May 4 13:49:47 2011 +0200
Automatic commit of package [oracle-rhnsat-selinux] release [10.2.0.20-1].
diff --git a/rel-eng/packages/oracle-rhnsat-selinux
b/rel-eng/packages/oracle-rhnsat-selinux
index dad9695..9c3b5c3 100644
--- a/rel-eng/packages/oracle-rhnsat-selinux
+++ b/rel-eng/packages/oracle-rhnsat-selinux
@@ -1 +1 @@
-10.2.0.19-1 selinux/oracle-rhnsat-selinux/
+10.2.0.20-1 selinux/oracle-rhnsat-selinux/
diff --git a/selinux/oracle-rhnsat-selinux/oracle-rhnsat-selinux.spec
b/selinux/oracle-rhnsat-selinux/oracle-rhnsat-selinux.spec
index 6a6e4bf..80eda86 100644
--- a/selinux/oracle-rhnsat-selinux/oracle-rhnsat-selinux.spec
+++ b/selinux/oracle-rhnsat-selinux/oracle-rhnsat-selinux.spec
@@ -5,7 +5,7 @@
%define modulename oracle-rhnsat
Name: oracle-rhnsat-selinux
-Version: 10.2.0.19
+Version: 10.2.0.20
Release: 1%{?dist}
Summary: SELinux policy module supporting Oracle
Group: System Environment/Base
@@ -116,6 +116,9 @@ fi
%attr(0755,root,root) %{_sbindir}/%{name}-enable
%changelog
+* Wed May 04 2011 Michael Mraka <michael.mraka(a)redhat.com> 10.2.0.20-1
+- fixed typo
+
* Mon May 02 2011 Michael Mraka <michael.mraka(a)redhat.com> 10.2.0.19-1
- 699979 - allow oracle to write to configuration manager files
commit 960f666846744e330e662bdf6a276fca7a6138b7
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Wed May 4 13:48:34 2011 +0200
fixed typo
diff --git a/selinux/oracle-rhnsat-selinux/oracle-rhnsat.fc
b/selinux/oracle-rhnsat-selinux/oracle-rhnsat.fc
index f328b9b..25dcb38 100644
--- a/selinux/oracle-rhnsat-selinux/oracle-rhnsat.fc
+++ b/selinux/oracle-rhnsat-selinux/oracle-rhnsat.fc
@@ -59,4 +59,4 @@
/var/tmp/.oracle(/.*)? gen_context(user_u:object_r:oracle_tmp_t,s0)
# oracle configuration manager stuff
-/opt/apps/oracle/web/product/(.*/)?/ccr/state(/.*)?'
gen_context(system_u:object_r:oracle_dbfile_t,s0)
+/opt/apps/oracle/web/product/(.*/)?ccr/state(/.*)?
gen_context(system_u:object_r:oracle_dbfile_t,s0)
commit 230f274f8e56b8351f34286ceabd724b57f4db6e
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Tue May 3 16:13:20 2011 +0200
some wierd packages have files in iso8859-1 not utf-8
fixing
Execution of /var/www/html/network/software/packages/file_list.pxt failed at Tue May 3
10:17:13 2011: Malformed UTF-8 character (fatal) at (eval 1669) line 1.
diff --git a/backend/server/importlib/packageImport.py
b/backend/server/importlib/packageImport.py
index f8f5bef..d46b6d4 100644
--- a/backend/server/importlib/packageImport.py
+++ b/backend/server/importlib/packageImport.py
@@ -238,7 +238,11 @@ class PackageImport(ChannelPackageSubscription):
# Process files too
fileList = package['files']
for f in fileList:
- nv = (f['name'], '')
+ try:
+ filename = f['name'].decode('utf8')
+ except UnicodeDecodeError:
+ filename = f['name'].decode('iso8859-1')
+ nv = (filename, '')
del f['name']
f['capability'] = nv
if not self.capabilities.has_key(nv):
Show replies by date