8:12 a.m.
Makefile | 5 +----
cas-admin | 9 ++++++---
cas.spec | 3 +++
setup.py | 4 ----
version | 2 +-
5 files changed, 11 insertions(+), 12 deletions(-)
New commits:
commit a7aa32cca2efe5a43b6e6df9f2f9f22a2b67bc30
Author: Adam Stokes <ajs(a)redhat.com>
Date: Fri Dec 19 09:12:03 2008 -0500
spec cleanup
diff --git a/Makefile b/Makefile
index a927610..8cd102e 100644
--- a/Makefile
+++ b/Makefile
@@ -12,7 +12,7 @@ SOURCE4 = $(PWD)/cas-admin.1.gz
all:
-.PHONY: tarball install version clean rpm
+.PHONY: tarball install clean rpm
tarball: clean
@echo "Creating archive"
@@ -30,9 +30,6 @@ tarball: clean
rpm:
rpmbuild -ba $(NAME).spec
-version:
- @echo "The version is $(NAME)-$(VERSION)"
-
clean:
@rm -rfv {dist,build}
@rm -rf *.\~*
diff --git a/cas-admin b/cas-admin
index 9e1c553..100140d 100755
--- a/cas-admin
+++ b/cas-admin
@@ -62,6 +62,7 @@ class CasDatabaseHandler(object):
pipe = Popen(cmd, stdout=PIPE, stderr=PIPE)
# setup count for kernels found, mainly for console output
count = 0
+ # create list of rpms from `cmd`
for line in pipe.stdout:
rpms.append(line.strip())
self.casLog.status("(found) %-5d kernel(s)" % (count,))
@@ -77,6 +78,7 @@ class CasDatabaseHandler(object):
if not self.rpmExist(x):
self.rpmDB[x] = []
count = count + 1
+ # temporary storage path in form of DEBUGS/COUNT
dst = os.path.join(DEBUGS, str(count))
rpmTool = RPMBase()
self.casLog.status("(extracting) [%d/%d] %-50s" % (count,
totalRpms,
@@ -91,7 +93,6 @@ class CasDatabaseHandler(object):
timestamp = stamper.timestamp(debugKernel)
# Build tuple of each debug type
self.rpmDB[x].append((debugKernel, timestamp))
- self.casLog.status("(timestamp) gathering timestamp ..")
self.util.save(self.rpmDB, RPMS)
# Cleanup extracted debugs
rmtree(dst)
@@ -121,7 +122,9 @@ class CasServerHandler(object):
# silly magic to get output from command module
# since we are doing one host at a time we just pull the first
# key from the dict and parse its return
- (sts, arch, err) = client_dict[client_dict.keys()[0]]
+ sts, arch, err = client_dict[client_dict.keys()[0]]
+ if sts:
+ self.casLog.debug(err)
# clean up arch string
arch = arch.strip()
if serverList.has_key(arch):
@@ -130,7 +133,7 @@ class CasServerHandler(object):
serverList[arch] = [hostname]
hostname_count = hostname_count + 1
self.util.save(serverList, SERVERS)
- self.casLog.debug("Server database built with %d server(s)
added.\n" % (hostname_count,))
+ self.casLog.info("Server database built with %d server(s) added." %
(hostname_count,))
except ImportError:
self.casLog.debug("Please install func (http://fedorahosted.org/func)
for " \
"an automated machine arch population.\n")
diff --git a/cas.spec b/cas.spec
index c9c7011..7a8c923 100644
--- a/cas.spec
+++ b/cas.spec
@@ -6,6 +6,9 @@ Source1: version
Version: %(echo `awk '{print $1 }' %{SOURCE1}`)
Release: %(echo `awk '{print $2 }' %{SOURCE1}`)%{?dist}
Source0: %{name}-%{version}.tar.gz
+Source2: cas-admin.1.gz
+Source3: cas.1.gz
+Source4: cas.conf
License: GPL
Group: Development/Libraries
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot
diff --git a/setup.py b/setup.py
index 038664c..06cffd6 100644
--- a/setup.py
+++ b/setup.py
@@ -1,7 +1,3 @@
-#!/usr/bin/env python
-
-# $Id: setup.py,v 1.12 2008/02/20 21:40:05 sdodson Exp $
-
"""
setup.py - distutils packaging
"""
diff --git a/version b/version
index 7885ba9..d13d5c2 100644
--- a/version
+++ b/version
@@ -1 +1 @@
-0.13 110
+0.13 112