[X2go-Commits] x2goserver.git - master (branch) updated: 3.1.1.3-73-g41b4b81

[X2Go dev team]

The branch, master has been updated
       via  41b4b81145b39e2c9fd4c2e821a1dedf71035e85 (commit)
      from  5751be61748137184011ed589391e1ea690547fc (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 41b4b81145b39e2c9fd4c2e821a1dedf71035e85
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Wed Oct 17 12:32:59 2012 +0200

    fixing Perl package chaos... (arggh)

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

Summary of changes:
 X2Go/Server.pm |   23 +++--------------------
 X2Go/Utils.pm  |    9 +++++----
 2 files changed, 8 insertions(+), 24 deletions(-)

The diff of changes is:
diff --git a/X2Go/Server.pm b/X2Go/Server.pm
index 86ba0d7..e63df56 100644
--- a/X2Go/Server.pm
+++ b/X2Go/Server.pm
@@ -20,37 +20,20 @@
 # Copyright (C) 2007-2012  Oleksandr Shneyder <oleksandr.shneyder at obviously-nice.de>
 # Copyright (C) 2007-2012  Heinz-Markus Graesing <heinz-m.graesing at obviously-nice.de>
 
-package X2Go::Utils;
+package X2Go::Server;
 
 =head1 NAME
 
-X2Go::Utils - X2Go utilities and helper functions for Perl
+X2Go::Server - X2Go Server package for Perl
 
 =head1 DESCRIPTION
 
-X2Go::Utils Perl package.
+X2Go::Server Perl package.
 
 =cut
 
 use strict;
 use base 'Exporter';
 
-OUR @EXPORT = ('source_environment');
-
-sub source_environment {
-    my $name = shift;
-
-    open my $fh, "<", $name
-        or die "could not open $name: $!";
-
-    while (<$fh>) {
-        chomp;
-        my ($k, $v) = split /=/, $_, 2;
-        $v =~ s/^(['"])(.*)\1/$2/; #' fix highlighter
-        $v =~ s/\$([a-zA-Z]\w*)/$ENV{$1}/g;
-        $v =~ s/`(.*?)`/`$1`/ge; #dangerous
-        $ENV{$k} = $v;
-    }
-}
 
 1;
diff --git a/X2Go/Utils.pm b/X2Go/Utils.pm
index fc6e92c..86ba0d7 100644
--- a/X2Go/Utils.pm
+++ b/X2Go/Utils.pm
@@ -20,21 +20,23 @@
 # Copyright (C) 2007-2012  Oleksandr Shneyder <oleksandr.shneyder at obviously-nice.de>
 # Copyright (C) 2007-2012  Heinz-Markus Graesing <heinz-m.graesing at obviously-nice.de>
 
-package X2Go::Server;
+package X2Go::Utils;
 
 =head1 NAME
 
-X2Go::Server - X2Go Server package for Perl
+X2Go::Utils - X2Go utilities and helper functions for Perl
 
 =head1 DESCRIPTION
 
-X2Go::Server Perl package.
+X2Go::Utils Perl package.
 
 =cut
 
 use strict;
 use base 'Exporter';
 
+OUR @EXPORT = ('source_environment');
+
 sub source_environment {
     my $name = shift;
 
@@ -51,5 +53,4 @@ sub source_environment {
     }
 }
 
-
 1;


hooks/post-receive
-- 
x2goserver.git (X2Go Server)

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 "x2goserver.git" (X2Go Server).