From 75115bea177df43bfe11ea21c27f5df810083072 Mon Sep 17 00:00:00 2001
From: Ramin Yaghoubzadeh <ryaghoub@techfak.uni-bielefeld.de>
Date: Tue, 14 Aug 2012 15:21:59 +0200
Subject: [PATCH] Fixed initialization bug in ipaaca-python
Defaults from /etc/rsb.conf and ~/.config/rsb.conf were falsely erased, fixed.
---
.gitignore | 6 ++++--
ipaacalib/java/manifest.mf | 10 ----------
ipaacalib/python/src/ipaaca.py | 4 ++--
3 files changed, 6 insertions(+), 14 deletions(-)
delete mode 100644 ipaacalib/java/manifest.mf
diff --git a/.gitignore b/.gitignore
index d4905ae..23a90d4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -16,8 +16,10 @@
.*.sw[a-z]
*.un~
Session.vim
-**/manifest.mf
-**/**/manifest.mf
+*/manifest.mf
+*/*/manifest.mf
+*/*/*/manifest.mf
+*/*/*/*/manifest.mf
**/*.*~
deps
dist
diff --git a/ipaacalib/java/manifest.mf b/ipaacalib/java/manifest.mf
deleted file mode 100644
index 486cc6a..0000000
--- a/ipaacalib/java/manifest.mf
+++ /dev/null
@@ -1,10 +0,0 @@
-Manifest-Version: 1.0
-Main-Class: main
-
-Name: IpaacaJava
-Specification-Title: IpaacaJava
-Specification-Version: 0.1
-Specification-Vendor: ipaaca
-Implementation-Title: IpaacaJava
-Implementation-Version: August 08 2012 11:03 AM
-Implementation-Vendor: ipaaca
\ No newline at end of file
diff --git a/ipaacalib/python/src/ipaaca.py b/ipaacalib/python/src/ipaaca.py
index 48263ac..07010b6 100755
--- a/ipaacalib/python/src/ipaaca.py
+++ b/ipaacalib/python/src/ipaaca.py
@@ -1165,9 +1165,9 @@ def initialize_ipaaca_rsb():#{{{
rsb.converter.registerGlobalConverter(
rsb.converter.ProtocolBufferConverter(
messageClass=ipaaca_pb2.IUCommission))
- #rsb.__defaultParticipantConfig = rsb.ParticipantConfig.fromDefaultSources()
+ rsb.__defaultParticipantConfig = rsb.ParticipantConfig.fromDefaultSources()
#t = rsb.ParticipantConfig.Transport('spread', {'enabled':'true'})
- rsb.__defaultParticipantConfig = rsb.ParticipantConfig.fromFile('rsb.cfg')
+ #rsb.__defaultParticipantConfig = rsb.ParticipantConfig.fromFile('rsb.cfg')
#}}}
--
GitLab