diff options
| author | Pascal Rigaux <pixel@mandriva.com> | 2006-01-03 12:55:54 +0000 |
|---|---|---|
| committer | Pascal Rigaux <pixel@mandriva.com> | 2006-01-03 12:55:54 +0000 |
| commit | 38fd860b9fa140a1b99b349bd03066ea04a5b0ae (patch) | |
| tree | e45d356e307db558fc4ad823a12aa7cef220eb56 | |
| parent | 400a9f3504f597680cfd8c775dcf9a2cd9077c69 (diff) | |
| download | perl-MDK-Common-38fd860b9fa140a1b99b349bd03066ea04a5b0ae.tar perl-MDK-Common-38fd860b9fa140a1b99b349bd03066ea04a5b0ae.tar.gz perl-MDK-Common-38fd860b9fa140a1b99b349bd03066ea04a5b0ae.tar.bz2 perl-MDK-Common-38fd860b9fa140a1b99b349bd03066ea04a5b0ae.tar.xz perl-MDK-Common-38fd860b9fa140a1b99b349bd03066ea04a5b0ae.zip | |
better fix for syscall.ph used somewhere else
| -rw-r--r-- | MDK/Common.pm.pl | 2 | ||||
| -rw-r--r-- | MDK/Common/System.pm | 11 | ||||
| -rw-r--r-- | perl-MDK-Common.spec | 3 |
3 files changed, 10 insertions, 6 deletions
diff --git a/MDK/Common.pm.pl b/MDK/Common.pm.pl index 6ae6639..bf785cc 100644 --- a/MDK/Common.pm.pl +++ b/MDK/Common.pm.pl @@ -73,7 +73,7 @@ our @ISA = qw(Exporter); # perl_checker: RE-EXPORT-ALL our @EXPORT = map { @$_ } map { values %{'MDK::Common::' . $_ . 'EXPORT_TAGS'} } grep { /::$/ } keys %MDK::Common::; -our $VERSION = "1.2.1"; +our $VERSION = "1.2.2"; 1; EOF diff --git a/MDK/Common/System.pm b/MDK/Common/System.pm index c1008dd..0f8d478 100644 --- a/MDK/Common/System.pm +++ b/MDK/Common/System.pm @@ -189,10 +189,6 @@ L<MDK::Common> use MDK::Common::Math; use MDK::Common::File; -#- force loading of syscall.ph into this namespace -delete @INC{qw(syscall.ph bits/syscall.ph sys/syscall.ph asm/unistd.ph)}; -require 'syscall.ph'; - use Exporter; our @ISA = qw(Exporter); our @EXPORT_OK = qw(%compat_arch $printable_chars $sizeof_int $bitof_int arch distrib typeFromMagic list_passwd list_home list_skels list_users syscall_ psizeof availableMemory availableRamMB gettimeofday unix2dos whereis_binary getVarsFromSh setVarsInSh setVarsInShMode addVarsInSh addVarsInShMode setExportedVarsInSh setExportedVarsInCsh template2file template2userfile read_gnomekderc update_gnomekderc fuzzy_pidofs); #); @@ -298,7 +294,12 @@ sub list_users() { sub syscall_ { my $f = shift; - syscall(&{"MDK::Common::System::SYS_$f"}, @_) == 0 + + #- load syscall.ph in package "main". If every use of syscall.ph do the same, all will be nice + package main; + require 'syscall.ph'; + + syscall(&{"main::SYS_$f"}, @_) == 0 } diff --git a/perl-MDK-Common.spec b/perl-MDK-Common.spec index 3fc84b3..3f129d9 100644 --- a/perl-MDK-Common.spec +++ b/perl-MDK-Common.spec @@ -42,6 +42,9 @@ rm -rf $RPM_BUILD_ROOT # MODIFY IN THE CVS: cvs.mandrakesoft.com:/cooker soft/perl-MDK-Common %changelog +* Tue Jan 3 2006 Pixel <pixel@mandriva.com> 1.2.2-1mdk +- better fix for syscall.ph used somewhere else + * Thu Dec 22 2005 Thierry Vignaud <tvignaud@mandriva.com> 1.2.1-1mdk - fix syscall() |