Changeset 234 for trunk/dasscm

Timestamp:

Oct 8, 2008, 4:29:29 PM (16 years ago)

Author:

joergs

Message:

removed the requirement for perl-libconfigfile, because it didn't exist for all systems. Replaced by the simple get_config function

Location:

trunk/dasscm

Files:

• dasscm (modified) (3 diffs)
• dasscm.spec (modified) (1 diff)

trunk/dasscm/dasscm

@@ -15 +15 @@
 use File::Path;
 use Term::ReadKey;
-
-#
-# used ConfigFile instead of SmartClient::Config,
-# because the huge amount of SmartClient dependencies
-#use SmartClient::Config;
-use ConfigFile;
+#use Data::Dumper;
 
 #####################################################################
@@ -32 +27 @@
 # configuration file
 my $config_file = "/etc/dasscm.conf";
-my $config      = ConfigFile::read_config_file($config_file);
+my $config      = get_config($config_file);
 my $DASSCM_LOCAL_REPOSITORY_BASE;
 my $DASSCM_REPOSITORY_NAME;
@@ -97 +92 @@
     exit 1
 }
+
+sub get_config
+{
+    my $file   = $_[0];
+
+    if( ! $file ) {
+        fatalerror( "failed to open config file" . $file );
+    }
+
+    my $data = {};
+
+    # try to open config file
+    if ( !open( FH, $file ) ) {
+        fatalerror( "failed to open config file" . $file );
+    } else {
+        while (<FH>) {
+            chomp;
+            if (/^#/) {
+                next;
+            }
+            if ( $_ =~ /=/g ) {
+                ## splitting in 2 fields at maximum
+                my ( $option, $value ) = split( /=/, $_, 2 );
+                $option =~ s/^\s+//g;
+                $option =~ s/\s+$//g;
+                $option =~ s/\"+//g;
+                $value  =~ s/^\s+//g;
+                $value  =~ s/\s+$//g;
+                $value  =~ s/\"+//g;
+
+                if ( length($option) ) {
+                    $data->{$option} = $value;
+                }
+            }
+        }
+    }
+    close(FH);
+
+    return $data;
+}
+
 
 sub check_env()

trunk/dasscm/dasscm.spec

@@ -12 +12 @@
 Autoreqprov:    on
 Summary:        dass configuration management tool
-Version:        0.7
+Version:        0.8
 Release:        0
-Requires:       subversion perl perl-TermReadKey perl-libconfigfile
+Requires:       subversion perl perl-TermReadKey
 Source:         %{name}-%{version}.tar.bz2
 Packager:       joerg.steffens@dass-it.de