diff options
| -rw-r--r-- | MDK/Common/System.pm | 8 | ||||
| -rw-r--r-- | perl-MDK-Common.spec | 6 |
2 files changed, 9 insertions, 5 deletions
diff --git a/MDK/Common/System.pm b/MDK/Common/System.pm index f6d724e..4bbedba 100644 --- a/MDK/Common/System.pm +++ b/MDK/Common/System.pm @@ -155,7 +155,7 @@ package MDK::Common::System; use MDK::Common::Math; use MDK::Common::File; - +use MDK::Common::Func qw(map_each); use vars qw(@ISA %EXPORT_TAGS @EXPORT_OK %compat_arch $printable_chars $sizeof_int $bitof_int); #); @ISA = qw(Exporter); @@ -312,7 +312,7 @@ sub setVarsInCsh { sub template2file { my ($in, $out, %toreplace) = @_; - output $out, map { s/@@@(.*?)@@@/$toreplace{$1}/g; $_ } MDK::Common::File::cat_($in); + MDK::Common::File::output($out, map { s/@@@(.*?)@@@/$toreplace{$1}/g; $_ } MDK::Common::File::cat_($in)); } sub template2userfile { my ($prefix, $in, $out_rel, $force, %toreplace) = @_; @@ -327,7 +327,7 @@ sub template2userfile { sub update_gnomekderc { my ($file, $category, %subst) = @_; - output $file, + MDK::Common::File::output($file, (map { my $l = $_; s/^\s*//; @@ -343,7 +343,7 @@ sub update_gnomekderc { } $l; } MDK::Common::File::cat_($file)), - (%subst && "[$category]\n", map_each { "$::a=$::b\n" } %subst); #- if category has not been found above. + (%subst && "[$category]\n", map_each { "$::a=$::b\n" } %subst)); #- if category has not been found above. } 1; diff --git a/perl-MDK-Common.spec b/perl-MDK-Common.spec index 9c95da5..aaec403 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 10mdk +%define release 11mdk %define perl_sitelib %(eval "`perl -V:installsitelib`"; echo $installsitelib) Summary: Various simple functions @@ -50,6 +50,10 @@ rm -rf $RPM_BUILD_ROOT # MODIFY IN THE CVS: cvs.mandrakesoft.com:/cooker soft/perl-MDK-Common %changelog +* Sat Feb 16 2002 Pixel <pixel@mandrakesoft.com> 1.0.2-11mdk +- MDK/Common/System.pm: fix call to "output" in "template2file" and "update_gnomekderc" +- perl-checker: don't fail on non-tagged import + * Thu Feb 14 2002 Pixel <pixel@mandrakesoft.com> 1.0.2-10mdk - warp_text returns a join'ed string in scalar context |