Permalink
Browse files

removing unneeded complication of imports.

  • Loading branch information...
1 parent c586910 commit e687ddba6acaae96b26fa1b0701e5e03ce3af95e @buzztroll buzztroll committed Dec 20, 2011
Showing with 9 additions and 24 deletions.
  1. +1 −8 lantorrent/pylantorrent/__init__.py
  2. +0 −14 lantorrent/tests/xinetd.conf
  3. +4 −1 scripts/lib/web_ball.py
  4. +4 −1 scripts/make-dist-remote.sh
@@ -7,13 +7,6 @@
from optparse import SUPPRESS_HELP
import hmac
-try:
- from hashlib import sha1 as sha
- from hashlib import sha256 as sha256
-
- sha.new()
-except:
- import sha
import base64
import uuid
@@ -111,7 +104,7 @@ def load_settings(self, ini_file):
config = VConfig()
def get_auth_hash(header_str):
- myhmac = hmac.new(config.pw, digestmod=sha)
+ myhmac = hmac.new(config.pw)
header_str = header_str.replace("\n", "")
header_str = header_str.replace("\r", "")
myhmac.update(header_str)
@@ -1,14 +0,0 @@
-# Simple configuration file for xinetd
-#
-# Some defaults, and include /etc/xinetd.d/
-
-defaults
-{
-
-# Please note that you need a log_type line to be able to use log_on_success
-# and log_on_failure. The default is the following :
-# log_type = SYSLOG daemon info
-
-}
-
-includedir /home/bresnaha/Dev/Nimbus/nimbus/lantorrent/tests/xinetd.d
@@ -4,7 +4,10 @@
import uuid
def newball(builddir=None, webdir=None, printbase=None, gitref=None):
-
+
+ print "HI!"
+ run("hostname")
+
if not builddir:
raise Exception("builddir required")
if not webdir:
@@ -66,5 +66,8 @@ NH_REL="`dirname $0`/.."
NH=`cd $NH_REL; pwd`
FAB_SCRIPT=$NH/scripts/lib/web_ball.py
-fab -f $FAB_SCRIPT $FABSSHKEY -u $USERNAME -H $HOSTNAME newball:builddir=$REMOTE_BUILDDIR,webdir=$REMOTE_WEBDIR,printbase=$PRINT_URL_BASE,gitref=$1
+cmd="fab -f $FAB_SCRIPT $FABSSHKEY -u $USERNAME -H $HOSTNAME newball:builddir=$REMOTE_BUILDDIR,webdir=$REMOTE_WEBDIR,printbase=$PRINT_URL_BASE,gitref=$1"
+
+echo $cmd
+$cmd

0 comments on commit e687ddb

Please sign in to comment.