[owncloud] stop spamming logs with a warning message OC triggers itself
Adam Williamson
adamwill at fedoraproject.org
Fri Jan 10 22:04:28 UTC 2014
commit 925b8b3fadd4d59fc3b0971ef6ca8ba1f4c2318e
Author: Adam Williamson <awilliam at redhat.com>
Date: Fri Jan 10 14:04:24 2014 -0800
stop spamming logs with a warning message OC triggers itself
owncloud-6.0.0a-sharing_backend_log.patch | 11 +++++++++++
owncloud.spec | 14 +++++++++++---
2 files changed, 22 insertions(+), 3 deletions(-)
---
diff --git a/owncloud-6.0.0a-sharing_backend_log.patch b/owncloud-6.0.0a-sharing_backend_log.patch
new file mode 100644
index 0000000..648c4fb
--- /dev/null
+++ b/owncloud-6.0.0a-sharing_backend_log.patch
@@ -0,0 +1,11 @@
+--- owncloud-6.0.0a/lib/public/share.php 2013-12-14 11:47:38.000000000 -0800
++++ owncloud-6.0.0a/lib/public/share.php.new 2014-01-10 14:00:00.705220134 -0800
+@@ -97,7 +97,7 @@
+ \OC_Log::write('OCP\Share',
+ 'Sharing backend '.$class.' not registered, '.self::$backendTypes[$itemType]['class']
+ .' is already registered for '.$itemType,
+- \OC_Log::WARN);
++ \OC_Log::DEBUG);
+ }
+ return false;
+ }
diff --git a/owncloud.spec b/owncloud.spec
index 589b543..cbfabf7 100644
--- a/owncloud.spec
+++ b/owncloud.spec
@@ -1,6 +1,6 @@
Name: owncloud
Version: 6.0.0a
-Release: 7%{?dist}
+Release: 8%{?dist}
Summary: Private file sync and share server
License: AGPLv3+ and MIT and BSD and CC-BY and CC-BY-SA and GPLv3 and Public Domain and (MPLv1.1 or GPLv2+ or LGPLv2+) and (MIT or GPL+) and (MIT or GPLv2) and ASL 2.0 and LGPLv3
@@ -37,6 +37,11 @@ Patch11: %{name}-6.0.0-fix-autoloader.patch
# Stripped version, we'll do the line ending correction in %prep and
# we don't need to move Blowfish around as we unbundle it
Patch12: %{name}-6.0.0a-apps_3rdparty_includes.patch
+# This 'warning' gets triggered regularly on OC installs where CalDAV
+# is used, see https://github.com/owncloud/contacts/issues/299 .
+# Upstream is coming up with something, but in the meantime, make it
+# a debug message instead.
+Patch13: %{name}-6.0.0a-sharing_backend_log.patch
BuildArch: noarch
@@ -154,6 +159,7 @@ sed -i 's/\r$//' apps/files_encryption/lib/crypt.php
%patch10
%patch11
%patch12 -p1
+%patch13 -p1
# prepare package doc
cp %{SOURCE3} README.fedora
@@ -179,7 +185,6 @@ rm -r 3rdparty/dompdf
# individual core apps now bundle libs as well - yay
rm -r apps/files_encryption/3rdparty/Crypt_Blowfish
rm -r apps/search_lucene/3rdparty/Zend
-# irodsphp review request: https://bugzilla.redhat.com/show_bug.cgi?id=1047478
rm -r apps/files_external/3rdparty/{Dropbox,irodsphp}
# bundling notes:
@@ -356,7 +361,10 @@ fi
%changelog
-* Thu Jan 09 2014 Adam Williamson <awilliam at redhat.com> - 6.0.0a-7
+* Fri Jan 10 2014 Adam Williamson <awilliam at redhat.com> - 6.0.0a-8
+- make a warning OC keeps triggering into a debug message
+
+* Thu Jan 9 2014 Adam Williamson <awilliam at redhat.com> - 6.0.0a-7
- re-enable irods, patch loading of it, add dependency on it
* Fri Jan 3 2014 Adam Williamson <awilliam at redhat.com> - 6.0.0a-6
More information about the scm-commits
mailing list