Merge branch 'master' of ssh://git.code.sf.net/p/xcat/confluent

confluent_client/bin/confetty

@@ -71,7 +71,10 @@ import confluent.client as client
 
 conserversequence = '\x05c'  # ctrl-e, c
 
-oldtcattr = termios.tcgetattr(sys.stdin.fileno())
+oldtcattr = None
+fd = sys.stdin
+if fd.isatty():
+    oldtcattr = termios.tcgetattr(fd.fileno())
 netserver = None
 laststate = {}
 
@@ -469,7 +472,8 @@ def quitconfetty(code=0, fullexit=False, fixterm=True):
     if fixterm or didconsole:
         currfl = fcntl.fcntl(sys.stdin.fileno(), fcntl.F_GETFL)
         fcntl.fcntl(sys.stdin.fileno(), fcntl.F_SETFL, currfl ^ os.O_NONBLOCK)
-        termios.tcsetattr(sys.stdin.fileno(), termios.TCSANOW, oldtcattr)
+        if oldtcattr is not None:
+            termios.tcsetattr(sys.stdin.fileno(), termios.TCSANOW, oldtcattr)
     if fullexit:
         sys.exit(code)
     else:
@@ -596,6 +600,7 @@ elif shellargs:
     command = " ".join(shellargs)
     do_command(command, netserver)
     quitconfetty(fullexit=True, fixterm=False)
+
 while inconsole or not doexit:
     if inconsole:
         rdylist, _, _ = select.select(

confluent_server/confluent/sockapi.py

@@ -45,7 +45,11 @@ auditlog = None
 try:
     SO_PEERCRED = socket.SO_PEERCRED
 except AttributeError:
-    SO_PEERCRED = 17
+    import platform
+    if "ppc64" in platform.machine():
+        SO_PEERCRED = 21
+	else:
+        SO_PEERCRED = 17
 
 
 class ClientConsole(object):

confluent_xcat/MANIFEST.in

@@ -1 +0,0 @@
-include confluent/plugins/console/*

confluent_xcat/Makefile

@@ -1,32 +0,0 @@
-
-PKGNAME=confluent_xcat
-VERNUM=`cat VERSION`
-
-all: clean prepare confluent_xcat 
-
-prepare: 
-	@echo [${PKGNAME}] preparing...
-	mkdir -p rpmbuild/BUILD
-	mkdir -p rpmbuild/BUILDROOT
-	mkdir -p rpmbuild/RPMS
-	mkdir -p rpmbuild/SOURCES
-	mkdir -p rpmbuild/SPECS
-	mkdir -p rpmbuild/SRPMS
-
-
-confluent_xcat: 
-	@echo [${PKGNAME}] building...
-	sed -e "s/#VERSION#/${VERNUM}/" setup.py.tmpl > setup.py
-	python setup.py sdist > /dev/null 2>&1
-	cp dist/*.tar.gz rpmbuild/SOURCES
-	sed -e "s/#VERSION#/${VERNUM}/" ${PKGNAME}.spec.tmpl > rpmbuild/SPECS/${PKGNAME}.spec
-	rpmbuild -ba rpmbuild/SPECS/${PKGNAME}.spec 
-
-clean: 
-	@echo [${PKGNAME}] cleaning...
-	rm -rf rpmbuild
-	rm -f setup.py
-	rm -rf ${PKGNAME}.egg-info
-	rm -rf dist
-
-	

confluent_xcat/README.txt

@@ -1 +0,0 @@
-xCAT integration with confluent systems management server

confluent_xcat/VERSION

@@ -1 +0,0 @@
-1.0

confluent_xcat/buildrpm

@@ -1 +0,0 @@
-../confluent_server/buildrpm

confluent_xcat/confluent/plugins/console/xcathmc.sh

@@ -1,2 +0,0 @@
-#!/bin/bash
-exec /opt/xcat/share/xcat/cons/hmc $CONFLUENT_NODE

confluent_xcat/confluent_xcat.spec.tmpl

@@ -1,41 +0,0 @@
-%define name confluent_xcat
-%define version #VERSION#
-%define release 1
-
-Summary: xCAT integration with confluent systems management server
-Name: %{name}
-Version: %{version}
-Release: %{release}
-Source0: %{name}-%{version}.tar.gz
-License: Apache2
-Group: Development/Libraries
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot
-Prefix: %{_prefix}
-BuildArch: noarch
-Requires: confluent_server
-Vendor: Victor Hu <vhu@us.ibm.com>
-Url: http://xcat.sf.net/
-
-%description
-xCAT integration with confluent system management server
-
-%prep
-%setup -n %{name}-%{version} -n %{name}-%{version}
-
-%build
-python setup.py build
-
-%install
-python setup.py install --single-version-externally-managed -O1 --root=$RPM_BUILD_ROOT --record=INSTALLED_FILES.bare --install-purelib=/opt/xcat/lib/python --install-scripts=/opt/xcat/bin
-for file in $(grep xcat/__init__.py INSTALLED_FILES.bare); do
-    rm $RPM_BUILD_ROOT/$file
-done
-grep -v xcat/__init__.py INSTALLED_FILES.bare > INSTALLED_FILES
-cat INSTALLED_FILES
-
-
-%clean
-rm -rf $RPM_BUILD_ROOT
-
-%files -f INSTALLED_FILES
-%defattr(-,root,root)

confluent_xcat/makesetup

@@ -1 +0,0 @@
-../confluent_server/makesetup

confluent_xcat/requirements.txt

@@ -1 +0,0 @@
-confluent_server>=0.1

confluent_xcat/setup.cfg

@@ -1,18 +0,0 @@
-[metadata]
-name = confluent_xcat
-summary = xCAT integration with confluent systems management server
-description-file =
-    README.txt
-author = Victor Hu
-author-email = vhu@us.ibm.com
-home-page = http://xcat.sf.net/
-classifier =
-    Intended Audience :: Information Technology
-    Intended Audience :: System Administrators
-    License :: OSI Approved :: Apache Software License
-    Operating System :: POSIX :: Linux
-    Programming Language :: Python :: 2.6
-    Programming Language :: Python :: 2.7
-
-[files]
-packages =

confluent_xcat/setup.py.tmpl

@@ -1,14 +0,0 @@
-from setuptools import setup
-import os
-
-setup(
-    name='confluent_xcat',
-    version='#VERSION#',
-    author='Victor Hu',
-    author_email='vhu@us.ibm.com',
-    url='http://xcat.sf.net/',
-    description='xCAT integration with confluent systems management server',
-    #packages=['xcat'],
-    install_requires=['confluent_server > 1.0.0'],
-    data_files=[('/opt/confluent/lib/python/confluent/plugins/console/', ['confluent/plugins/console/xcathmc.sh'])],
-)