[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r15333 - gauger
From: |
gnunet |
Subject: |
[GNUnet-SVN] r15333 - gauger |
Date: |
Fri, 27 May 2011 14:23:24 +0200 |
Author: bartpolot
Date: 2011-05-27 14:23:24 +0200 (Fri, 27 May 2011)
New Revision: 15333
Modified:
gauger/gauger
Log:
Added support for Bazaar, unified code formatting
Modified: gauger/gauger
===================================================================
--- gauger/gauger 2011-05-27 12:22:46 UTC (rev 15332)
+++ gauger/gauger 2011-05-27 12:23:24 UTC (rev 15333)
@@ -43,7 +43,7 @@
(stdout, stderr) = p.communicate()
x = 1
while (stdout[0:x].isdigit()):
- x += 1
+ x += 1
if(x == 1):
return 0
return int(stdout[0:x-1])
@@ -60,6 +60,12 @@
(stdout, stderr) = p.communicate()
return int(stdout)
+def bzrversion():
+ p = subprocess.Popen("bzr revno", shell=True,
+ stdout=subprocess.PIPE, stderr=subprocess.PIPE)
+ (stdout, stderr) = p.communicate()
+ return int(stdout)
+
def gnuarchversion():
p = subprocess.Popen("tla logs | wc -l", shell=True,
stdout=subprocess.PIPE, stderr=subprocess.PIPE)
@@ -95,16 +101,16 @@
args = process_arguments()
try:
- configfile = open("gauger-cli.conf", "r")
- remoteurl, username, password = configfile.readline().strip().split()
+ configfile = open("gauger-cli.conf", "r")
+ remoteurl, username, password = configfile.readline().strip().split()
except:
- try:
- homefilename = os.path.join(os.path.expanduser('~'), ".gauger-cli.conf")
- configfile = open(homefilename, "r")
- remoteurl, username, password = configfile.readline().strip().split()
- except:
- print >> sys.stderr, "please put 'remoteurl username password' in
gauger-cli.conf"
- exit(1)
+ try:
+ homefilename = os.path.join(os.path.expanduser('~'),
".gauger-cli.conf")
+ configfile = open(homefilename, "r")
+ remoteurl, username, password = configfile.readline().strip().split()
+ except:
+ print >> sys.stderr, "please put 'remoteurl username password' in
gauger-cli.conf"
+ exit(1)
if(args.check):
exit(0)
@@ -121,15 +127,17 @@
revision = gitversion()
elif(os.path.exists('.hg')):
revision = hgversion()
+elif(os.path.exists('.bzr')):
+ revision = bzrversion()
elif(os.path.exists('{arch}')):
revision = gnuarchversion()
elif(os.path.exists('_MTN')):
revision = mtnversion()
if (not revision):
- print >> sys.stderr, "please make sure to be in a respository supported by
gauger"
- print >> sys.stderr, "or specify an identifier at runtime with the --id
option"
- exit(1)
+ print >> sys.stderr, "please make sure to be in a respository supported by
gauger"
+ print >> sys.stderr, "or specify an identifier at runtime with the --id
option"
+ exit(1)
args.category = esc_separators(args.category)
args.name = esc_separators(args.name)
@@ -147,10 +155,10 @@
l1 = {'pass': password, 'revision': revision, 'name': args.name, 'value':
args.data}
try:
- f = urllib.urlopen(remoteurl, urllib.urlencode(l1))
+ f = urllib.urlopen(remoteurl, urllib.urlencode(l1))
except:
- print >> sys.stderr, "Could not connect to", remoteurl
- exit(1)
+ print >> sys.stderr, "Could not connect to", remoteurl
+ exit(1)
try:
print f.readline()
except:
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r15333 - gauger,
gnunet <=