diff options
| author | Adam Stokes <adam.stokes@ubuntu.com> | 2013-04-04 20:50:59 -0400 |
|---|---|---|
| committer | Adam Stokes <adam.stokes@ubuntu.com> | 2013-04-04 20:50:59 -0400 |
| commit | 0c48b167ea53362b67c46a10c17ee7bc9ea9887a (patch) | |
| tree | 0c4871eb82bc7611cdc29e6711861f26b506422e /Makefile | |
| parent | 76156e8b7a8b7a31e30038819d0aa0d7ca5de197 (diff) | |
| download | sos-0c48b167ea53362b67c46a10c17ee7bc9ea9887a.tar.gz | |
Fix unittests and more pep8 conforming
- In our unittest we defined 'is_installed' to be a bool when in fact we wanted
to verify if a package is installed via the _method_ is is_installed. Since
overriding that method with our variable definition we basically removed
any functionality of 'is_installed' method in Plugin class.
- Initializing a fake plugin to test was failing due to our global
logger not being initialized. Put a simple check in the library to
make sure the logger is defined no matter what the calling state does.
- Make import selinux conditional
- Add travis-ci support
- Rename README to utilize travis-ci build status and other markdown supported
features
Signed-off-by: Adam Stokes <adam.stokes@ubuntu.com>
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -48,7 +48,7 @@ install: updateversion install -m755 sosreport $(DESTDIR)/usr/sbin/sosreport install -m644 sosreport.1.gz $(DESTDIR)/usr/share/man/man1/. install -m644 sos.conf.5.gz $(DESTDIR)/usr/share/man/man5/. - install -m644 LICENSE README $(DESTDIR)/usr/share/$(NAME)/. + install -m644 LICENSE README.md $(DESTDIR)/usr/share/$(NAME)/. install -m644 $(NAME).conf $(DESTDIR)/etc/$(NAME).conf install -m644 gpgkeys/$(GPG_TPL)support.pub $(DESTDIR)/usr/share/$(NAME)/. for d in $(SUBDIRS); do make DESTDIR=`cd $(DESTDIR); pwd` -C $$d install; [ $$? = 0 ] || exit 1; done @@ -58,7 +58,7 @@ updateversion: $(NAME)-$(VERSION).tar.gz: clean gpgkey @mkdir -p $(ARCHIVE_DIR) - @tar -cv sosreport sos doc man po sos.conf LICENSE README sos.spec Makefile | tar -x -C $(ARCHIVE_DIR) + @tar -cv sosreport sos doc man po sos.conf LICENSE README.md sos.spec Makefile | tar -x -C $(ARCHIVE_DIR) @mkdir -p $(ARCHIVE_DIR)/gpgkeys @cp gpgkeys/$(GPG_TPL)support.pub $(ARCHIVE_DIR)/gpgkeys/. @tar Ccvzf $(DIST_BUILD_DIR) $(DIST_BUILD_DIR)/$(NAME)-$(VERSION).tar.gz $(NAME)-$(VERSION) |