Sandro Bonazzola has uploaded a new change for review.
Change subject: packaging: cleanups
......................................................................
packaging: cleanups
- Solved rpmlint issues:
W: hidden-file-or-dir /etc/ovirt-engine/logcollector.conf.d/.keep
E: zero-length /etc/ovirt-engine/logcollector.conf.d/.keep
W: non-conffile-in-etc /etc/ovirt-engine/logcollector.conf.d/.keep
W: manual-page-warning /usr/share/man/man8/engine-log-collector.8.gz
28: name expected (got a special character): treated as missing
- Fixed BuildRoot tag for EPEL-5 compatibility
- Solved distcheck issues:
- Added missing README.localization to the package
- Removed LICENSE file, COPYING already provided
- Added missing src/tests.py to the package
Change-Id: I2b11a1eb73c02b87a8fd41954254f1031dfb1cdf
Related-To: https://bugzilla.redhat.com/831878
Signed-off-by: Sandro Bonazzola <sbona...@redhat.com>
---
M .gitignore
D LICENSE
M Makefile.am
M ovirt-log-collector.spec.in
D src/.keep
M src/Makefile.am
M src/engine-log-collector.8
7 files changed, 10 insertions(+), 185 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/ovirt-log-collector
refs/changes/47/18447/1
diff --git a/.gitignore b/.gitignore
index 7592df5..095540c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -13,12 +13,11 @@
config.rpath
config.sub
ABOUT-NLS
-
tmp.*
*.pyc
*.pyo
*~
-
+src/logrotate.d/ovirt-log-collector
src/config.py
src/config.py.in
ovirt-log-collector-*.tar.gz
diff --git a/LICENSE b/LICENSE
deleted file mode 100644
index f433b1a..0000000
--- a/LICENSE
+++ /dev/null
@@ -1,177 +0,0 @@
-
- Apache License
- Version 2.0, January 2004
- http://www.apache.org/licenses/
-
- TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
- 1. Definitions.
-
- "License" shall mean the terms and conditions for use, reproduction,
- and distribution as defined by Sections 1 through 9 of this document.
-
- "Licensor" shall mean the copyright owner or entity authorized by
- the copyright owner that is granting the License.
-
- "Legal Entity" shall mean the union of the acting entity and all
- other entities that control, are controlled by, or are under common
- control with that entity. For the purposes of this definition,
- "control" means (i) the power, direct or indirect, to cause the
- direction or management of such entity, whether by contract or
- otherwise, or (ii) ownership of fifty percent (50%) or more of the
- outstanding shares, or (iii) beneficial ownership of such entity.
-
- "You" (or "Your") shall mean an individual or Legal Entity
- exercising permissions granted by this License.
-
- "Source" form shall mean the preferred form for making modifications,
- including but not limited to software source code, documentation
- source, and configuration files.
-
- "Object" form shall mean any form resulting from mechanical
- transformation or translation of a Source form, including but
- not limited to compiled object code, generated documentation,
- and conversions to other media types.
-
- "Work" shall mean the work of authorship, whether in Source or
- Object form, made available under the License, as indicated by a
- copyright notice that is included in or attached to the work
- (an example is provided in the Appendix below).
-
- "Derivative Works" shall mean any work, whether in Source or Object
- form, that is based on (or derived from) the Work and for which the
- editorial revisions, annotations, elaborations, or other modifications
- represent, as a whole, an original work of authorship. For the purposes
- of this License, Derivative Works shall not include works that remain
- separable from, or merely link (or bind by name) to the interfaces of,
- the Work and Derivative Works thereof.
-
- "Contribution" shall mean any work of authorship, including
- the original version of the Work and any modifications or additions
- to that Work or Derivative Works thereof, that is intentionally
- submitted to Licensor for inclusion in the Work by the copyright owner
- or by an individual or Legal Entity authorized to submit on behalf of
- the copyright owner. For the purposes of this definition, "submitted"
- means any form of electronic, verbal, or written communication sent
- to the Licensor or its representatives, including but not limited to
- communication on electronic mailing lists, source code control systems,
- and issue tracking systems that are managed by, or on behalf of, the
- Licensor for the purpose of discussing and improving the Work, but
- excluding communication that is conspicuously marked or otherwise
- designated in writing by the copyright owner as "Not a Contribution."
-
- "Contributor" shall mean Licensor and any individual or Legal Entity
- on behalf of whom a Contribution has been received by Licensor and
- subsequently incorporated within the Work.
-
- 2. Grant of Copyright License. Subject to the terms and conditions of
- this License, each Contributor hereby grants to You a perpetual,
- worldwide, non-exclusive, no-charge, royalty-free, irrevocable
- copyright license to reproduce, prepare Derivative Works of,
- publicly display, publicly perform, sublicense, and distribute the
- Work and such Derivative Works in Source or Object form.
-
- 3. Grant of Patent License. Subject to the terms and conditions of
- this License, each Contributor hereby grants to You a perpetual,
- worldwide, non-exclusive, no-charge, royalty-free, irrevocable
- (except as stated in this section) patent license to make, have made,
- use, offer to sell, sell, import, and otherwise transfer the Work,
- where such license applies only to those patent claims licensable
- by such Contributor that are necessarily infringed by their
- Contribution(s) alone or by combination of their Contribution(s)
- with the Work to which such Contribution(s) was submitted. If You
- institute patent litigation against any entity (including a
- cross-claim or counterclaim in a lawsuit) alleging that the Work
- or a Contribution incorporated within the Work constitutes direct
- or contributory patent infringement, then any patent licenses
- granted to You under this License for that Work shall terminate
- as of the date such litigation is filed.
-
- 4. Redistribution. You may reproduce and distribute copies of the
- Work or Derivative Works thereof in any medium, with or without
- modifications, and in Source or Object form, provided that You
- meet the following conditions:
-
- (a) You must give any other recipients of the Work or
- Derivative Works a copy of this License; and
-
- (b) You must cause any modified files to carry prominent notices
- stating that You changed the files; and
-
- (c) You must retain, in the Source form of any Derivative Works
- that You distribute, all copyright, patent, trademark, and
- attribution notices from the Source form of the Work,
- excluding those notices that do not pertain to any part of
- the Derivative Works; and
-
- (d) If the Work includes a "NOTICE" text file as part of its
- distribution, then any Derivative Works that You distribute must
- include a readable copy of the attribution notices contained
- within such NOTICE file, excluding those notices that do not
- pertain to any part of the Derivative Works, in at least one
- of the following places: within a NOTICE text file distributed
- as part of the Derivative Works; within the Source form or
- documentation, if provided along with the Derivative Works; or,
- within a display generated by the Derivative Works, if and
- wherever such third-party notices normally appear. The contents
- of the NOTICE file are for informational purposes only and
- do not modify the License. You may add Your own attribution
- notices within Derivative Works that You distribute, alongside
- or as an addendum to the NOTICE text from the Work, provided
- that such additional attribution notices cannot be construed
- as modifying the License.
-
- You may add Your own copyright statement to Your modifications and
- may provide additional or different license terms and conditions
- for use, reproduction, or distribution of Your modifications, or
- for any such Derivative Works as a whole, provided Your use,
- reproduction, and distribution of the Work otherwise complies with
- the conditions stated in this License.
-
- 5. Submission of Contributions. Unless You explicitly state otherwise,
- any Contribution intentionally submitted for inclusion in the Work
- by You to the Licensor shall be under the terms and conditions of
- this License, without any additional terms or conditions.
- Notwithstanding the above, nothing herein shall supersede or modify
- the terms of any separate license agreement you may have executed
- with Licensor regarding such Contributions.
-
- 6. Trademarks. This License does not grant permission to use the trade
- names, trademarks, service marks, or product names of the Licensor,
- except as required for reasonable and customary use in describing the
- origin of the Work and reproducing the content of the NOTICE file.
-
- 7. Disclaimer of Warranty. Unless required by applicable law or
- agreed to in writing, Licensor provides the Work (and each
- Contributor provides its Contributions) on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
- implied, including, without limitation, any warranties or conditions
- of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
- PARTICULAR PURPOSE. You are solely responsible for determining the
- appropriateness of using or redistributing the Work and assume any
- risks associated with Your exercise of permissions under this License.
-
- 8. Limitation of Liability. In no event and under no legal theory,
- whether in tort (including negligence), contract, or otherwise,
- unless required by applicable law (such as deliberate and grossly
- negligent acts) or agreed to in writing, shall any Contributor be
- liable to You for damages, including any direct, indirect, special,
- incidental, or consequential damages of any character arising as a
- result of this License or out of the use or inability to use the
- Work (including but not limited to damages for loss of goodwill,
- work stoppage, computer failure or malfunction, or any and all
- other commercial damages or losses), even if such Contributor
- has been advised of the possibility of such damages.
-
- 9. Accepting Warranty or Additional Liability. While redistributing
- the Work or Derivative Works thereof, You may choose to offer,
- and charge a fee for, acceptance of support, warranty, indemnity,
- or other liability obligations and/or rights consistent with this
- License. However, in accepting such obligations, You may act only
- on Your own behalf and on Your sole responsibility, not on behalf
- of any other Contributor, and only if You agree to indemnify,
- defend, and hold each Contributor harmless for any liability
- incurred by, or claims asserted against, such Contributor by reason
- of your accepting any such warranty or additional liability.
-
- END OF TERMS AND CONDITIONS
diff --git a/Makefile.am b/Makefile.am
index c00305c..265bf53 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -35,6 +35,7 @@
.gitignore \
m4/.gitignore \
po/.gitignore \
+ README.localization \
$(NULL)
SUBDIRS = \
diff --git a/ovirt-log-collector.spec.in b/ovirt-log-collector.spec.in
index b73884e..63c5cfd 100644
--- a/ovirt-log-collector.spec.in
+++ b/ovirt-log-collector.spec.in
@@ -26,7 +26,7 @@
URL: http://www.ovirt.org
Source:
http://resources.ovirt.org/releases/nightly/src/%{package_name}-%{package_version}.tar.gz
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch: noarch
Requires: python
Requires: python-dateutil
@@ -58,9 +58,9 @@
%doc AUTHORS
%doc COPYING
%dir %{_localstatedir}/log/ovirt-engine/%{package_name}
+%dir %{_sysconfdir}/ovirt-engine/logcollector.conf.d
%config(noreplace) %{_sysconfdir}/ovirt-engine/logcollector.conf
%config(noreplace) %{_sysconfdir}/logrotate.d/%{package_name}
-%{_sysconfdir}/ovirt-engine/logcollector.conf.d/.keep
%{python_sitelib}/ovirt_log_collector/*.py*
%{python_sitelib}/ovirt_log_collector/helper/*.py*
%{python_sitelib}/sos/plugins/*.py*
diff --git a/src/.keep b/src/.keep
deleted file mode 100644
index e69de29..0000000
--- a/src/.keep
+++ /dev/null
diff --git a/src/Makefile.am b/src/Makefile.am
index d442b8b..74bf7cb 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -28,6 +28,10 @@
config.py \
$(NULL)
+EXTRA_DIST = \
+ tests.py \
+ $(NULL)
+
config.py: \
$(top_srcdir)/configure.ac \
$(NULL)
@@ -57,9 +61,6 @@
$(NULL)
confddir=$(engineconfigdir)/logcollector.conf.d
-dist_confd_DATA = \
- .keep \
- $(NULL)
all-local: \
python-syntax-check \
@@ -70,6 +71,7 @@
$(NULL)
install-data-hook:
+ $(MKDIR_P) "$(DESTDIR)$(confddir)"
$(MKDIR_P) "$(DESTDIR)$(bindir)"
$(MKDIR_P) "$(DESTDIR)$(localstatedir)/log/ovirt-engine/$(PACKAGE_NAME)"
chmod a+x "$(DESTDIR)$(ovirtlogcollectorlibdir)/__main__.py"
diff --git a/src/engine-log-collector.8 b/src/engine-log-collector.8
index c6800b5..04e9229 100644
--- a/src/engine-log-collector.8
+++ b/src/engine-log-collector.8
@@ -25,7 +25,7 @@
The \fBlist\fP option lists hypervisors controlled by the oVirt Engine, while
\fBcollect\fP (default) actually runs the collection. The result of running
\fBengine\-log\-collector\fP is a compressed archive that contains logs and
other information from some or all of the following:
-.\' Describe engine\-slimmed
+.\"TODO: Describe engine\-slimmed
.IP "\fB* Hypervisor Log Collection\fP"
--
To view, visit http://gerrit.ovirt.org/18447
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I2b11a1eb73c02b87a8fd41954254f1031dfb1cdf
Gerrit-PatchSet: 1
Gerrit-Project: ovirt-log-collector
Gerrit-Branch: master
Gerrit-Owner: Sandro Bonazzola <sbona...@redhat.com>
_______________________________________________
Engine-patches mailing list
Engine-patches@ovirt.org
http://lists.ovirt.org/mailman/listinfo/engine-patches
