summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2003-09-19 14:48:46 +0000
committerPascal Rigaux <pixel@mandriva.com>2003-09-19 14:48:46 +0000
commita4ebe5a0284255cc7a0946f1e895af94e37b7c86 (patch)
tree93a44f80f2540fadfc54e5777cb1ad1510fc92f4
parent30b881dc48fbcd78093970540164b39fb5667563 (diff)
downloadperl-MDK-Common-a4ebe5a0284255cc7a0946f1e895af94e37b7c86.tar
perl-MDK-Common-a4ebe5a0284255cc7a0946f1e895af94e37b7c86.tar.gz
perl-MDK-Common-a4ebe5a0284255cc7a0946f1e895af94e37b7c86.tar.bz2
perl-MDK-Common-a4ebe5a0284255cc7a0946f1e895af94e37b7c86.tar.xz
perl-MDK-Common-a4ebe5a0284255cc7a0946f1e895af94e37b7c86.zip
- read_gnomekderc() & update_gnomekderc() will now handle key=value where key
can contain spaces
-rw-r--r--MDK/Common.pm.pl2
-rw-r--r--MDK/Common/System.pm4
-rw-r--r--perl-MDK-Common.spec6
3 files changed, 8 insertions, 4 deletions
diff --git a/MDK/Common.pm.pl b/MDK/Common.pm.pl
index 146e09d..5a66f95 100644
--- a/MDK/Common.pm.pl
+++ b/MDK/Common.pm.pl
@@ -71,7 +71,7 @@ use vars qw(@ISA @EXPORT $VERSION); #);
# perl_checker: RE-EXPORT-ALL
@EXPORT = map { @$_ } map { values %{'MDK::Common::' . $_ . 'EXPORT_TAGS'} } grep { /::$/ } keys %MDK::Common::;
-$VERSION = "1.1.6";
+$VERSION = "1.1.7";
1;
EOF
diff --git a/MDK/Common/System.pm b/MDK/Common/System.pm
index de9e3d4..40c1fc8 100644
--- a/MDK/Common/System.pm
+++ b/MDK/Common/System.pm
@@ -360,7 +360,7 @@ sub read_gnomekderc {
my %h;
foreach (MDK::Common::File::cat_($file), "[NOCATEGORY]\n") {
if (/^\s*\[\Q$category\E\]/i ... /^\[/) {
- $h{$1} = $2 if /^\s*(\w*?)=(.*)/;
+ $h{$1} = $2 if /^\s*([^=]*?)=(.*)/;
}
}
%h;
@@ -378,7 +378,7 @@ sub update_gnomekderc {
chomp $s; $s .= "\n";
$s .= "$_->[0]=$_->[1]\n" foreach values %subst;
%subst = ();
- } elsif (/^\s*(\w*?)=/) {
+ } elsif (/^\s*([^=]*?)=/) {
if (my $e = delete $subst{lc($1)}) {
$_ = "$1=$e->[1]\n";
}
diff --git a/perl-MDK-Common.spec b/perl-MDK-Common.spec
index 9305cdc..5da43bb 100644
--- a/perl-MDK-Common.spec
+++ b/perl-MDK-Common.spec
@@ -2,7 +2,7 @@
# do not change the version here, change in MDK/Common.pm.pl
%define version THEVERSION
-%define release 3mdk
+%define release 1mdk
%ifarch x86_64
%define build_option PERL_CHECKER_TARGET='debug-code BCSUFFIX=""'
@@ -72,6 +72,10 @@ rm -rf $RPM_BUILD_ROOT
# MODIFY IN THE CVS: cvs.mandrakesoft.com:/cooker soft/perl-MDK-Common
%changelog
+* Fri Sep 19 2003 Pixel <pixel@mandrakesoft.com> 1.1.7-1mdk
+- read_gnomekderc() & update_gnomekderc() will now handle key=value where key
+can contain spaces
+
* Mon Sep 1 2003 Pixel <pixel@mandrakesoft.com> 1.1.6-3mdk
- MDK::Common::System::list_users() should list user 500 if it exists