[X2go-Commits] x2gobroker.git - master (branch) updated: 0.0.0.5-44-gfa1b069

X2Go dev team git-admin at x2go.org
Mon Mar 4 23:06:47 CET 2013


The branch, master has been updated
       via  fa1b06962977c3c10d90af3544e2d1aa8a7ac4e4 (commit)
       via  f74dbc86da2fee649b2c8e75104e7b45885742d4 (commit)
       via  fdfc849b6c698e4008356fc4b35c206d7fceb73c (commit)
      from  a72d1e92b9dfdde11637cf1a10022a8685e16075 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit fa1b06962977c3c10d90af3544e2d1aa8a7ac4e4
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Mon Mar 4 23:06:34 2013 +0100

    fix missing function call args

commit f74dbc86da2fee649b2c8e75104e7b45885742d4
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Mon Mar 4 23:06:18 2013 +0100

    daemonized delayed_execution thread

commit fdfc849b6c698e4008356fc4b35c206d7fceb73c
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Mon Mar 4 23:05:56 2013 +0100

    be less strict with python and dpkg-dev build-dependencies to allow building against Ubuntu lucid

-----------------------------------------------------------------------

Summary of changes:
 debian/control          |    4 ++--
 lib/x2gobroker-agent.pl |    2 +-
 x2gobroker/agent.py     |    1 +
 3 files changed, 4 insertions(+), 3 deletions(-)

The diff of changes is:
diff --git a/debian/control b/debian/control
index 3190f5c..016f31b 100644
--- a/debian/control
+++ b/debian/control
@@ -8,8 +8,8 @@ Uploaders:
 Build-Depends:
  debhelper (>= 7.0.50~),
  cdbs (>= 0.4.90~),
- dpkg-dev (>= 1.16.1~),
- python (>= 2.6.6-3~),
+ dpkg-dev (>= 1.15.5.6~),
+ python (>= 2.6.5-0~),
  python-setuptools,
 Standards-Version: 3.9.3
 XS-Python-Version: >= 2.4
diff --git a/lib/x2gobroker-agent.pl b/lib/x2gobroker-agent.pl
index 9b20e40..1e98d9d 100755
--- a/lib/x2gobroker-agent.pl
+++ b/lib/x2gobroker-agent.pl
@@ -187,7 +187,7 @@ if($mode eq 'delauthkey')
 	my $authkeyfile = shift or die;
 	InitX2GoUser($uid, $uidNumber, $gidNumber, $home);
 	print "OK\n";
-	DelAuthKey($uidNumber, $gidNumber, $home);
+	DelAuthKey($uid, $uidNumber, $gidNumber, $home, $pubkey, $authkeyfile);
 }
 
 if($mode eq 'suspend')
diff --git a/x2gobroker/agent.py b/x2gobroker/agent.py
index 23ea1bc..b32489a 100644
--- a/x2gobroker/agent.py
+++ b/x2gobroker/agent.py
@@ -40,6 +40,7 @@ class delayed_execution(threading.Thread):
         self.agent_func = agent_func
         self.delay = delay
         self.kwargs = kwargs
+        self.daemon = True
         self.start()
 
     def run(self):


hooks/post-receive
-- 
x2gobroker.git (HTTP(S) Session broker for X2Go)

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "x2gobroker.git" (HTTP(S) Session broker for X2Go).




More information about the x2go-commits mailing list