r53139 - in /trunk/libsys-filesystem-perl: ./ debian/ debian/patches/ lib/Sys/ lib/Sys/Filesystem/ t/
ansgar-guest at users.alioth.debian.org
ansgar-guest at users.alioth.debian.org
Sun Feb 21 17:13:27 UTC 2010
Author: ansgar-guest
Date: Sun Feb 21 17:13:19 2010
New Revision: 53139
URL: http://svn.debian.org/wsvn/pkg-perl/?sc=1&rev=53139
Log:
* New upstream release.
* Drop patch fix-pod-spelling.patch (applied upstream).
* Add myself to Uploaders.
Removed:
trunk/libsys-filesystem-perl/debian/patches/
Modified:
trunk/libsys-filesystem-perl/Build.PL
trunk/libsys-filesystem-perl/Changes
trunk/libsys-filesystem-perl/META.yml
trunk/libsys-filesystem-perl/README
trunk/libsys-filesystem-perl/debian/changelog
trunk/libsys-filesystem-perl/debian/control
trunk/libsys-filesystem-perl/lib/Sys/Filesystem.pm
trunk/libsys-filesystem-perl/lib/Sys/Filesystem/Aix.pm
trunk/libsys-filesystem-perl/lib/Sys/Filesystem/Cygwin.pm
trunk/libsys-filesystem-perl/lib/Sys/Filesystem/Darwin.pm
trunk/libsys-filesystem-perl/lib/Sys/Filesystem/Dummy.pm
trunk/libsys-filesystem-perl/lib/Sys/Filesystem/Freebsd.pm
trunk/libsys-filesystem-perl/lib/Sys/Filesystem/Hpux.pm
trunk/libsys-filesystem-perl/lib/Sys/Filesystem/Linux.pm
trunk/libsys-filesystem-perl/lib/Sys/Filesystem/Mswin32.pm
trunk/libsys-filesystem-perl/lib/Sys/Filesystem/Netbsd.pm
trunk/libsys-filesystem-perl/lib/Sys/Filesystem/Solaris.pm
trunk/libsys-filesystem-perl/lib/Sys/Filesystem/Unix.pm
trunk/libsys-filesystem-perl/t/03test.t
Modified: trunk/libsys-filesystem-perl/Build.PL
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libsys-filesystem-perl/Build.PL?rev=53139&op=diff
==============================================================================
--- trunk/libsys-filesystem-perl/Build.PL (original)
+++ trunk/libsys-filesystem-perl/Build.PL Sun Feb 21 17:13:19 2010
@@ -1,5 +1,5 @@
# vim:ts=4:sw=4:tw=78
-# $Id: Build.PL 47 2009-11-29 13:50:03Z trevor $
+# $Id: Build.PL 71 2010-02-19 13:11:19Z trevor $
use 5.006;
@@ -22,7 +22,7 @@
'Params::Util' => '1.00',
'Module::Pluggable' => '3.9',
'IO' => 0,
- ( $^O eq /Win32/i ? ( 'Win32::DriveInfo' => 0, ) : () ),
+ ( $^O eq 'MSWin32' ? ( 'Win32::DriveInfo' => 0, ) : () ),
},
recommends => {
Modified: trunk/libsys-filesystem-perl/Changes
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libsys-filesystem-perl/Changes?rev=53139&op=diff
==============================================================================
--- trunk/libsys-filesystem-perl/Changes (original)
+++ trunk/libsys-filesystem-perl/Changes Sun Feb 21 17:13:19 2010
@@ -1,3 +1,9 @@
+1.27
+ Fixing RT#54406 (patch from Robert Bohne with some modifications)
+ Fixing RT#54599 (patch from Jonathan Yu)
+ Fixing wrong dependencies detection on Windows
+ Fixing generic fstab/mnttab reading
+
1.26
Adding more special file systems for Linux
Prefer /proc/self/mounts over /etc/mtab (when available), fixes
Modified: trunk/libsys-filesystem-perl/META.yml
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libsys-filesystem-perl/META.yml?rev=53139&op=diff
==============================================================================
--- trunk/libsys-filesystem-perl/META.yml (original)
+++ trunk/libsys-filesystem-perl/META.yml Sun Feb 21 17:13:19 2010
@@ -13,40 +13,40 @@
provides:
Sys::Filesystem:
file: lib/Sys/Filesystem.pm
- version: 1.26
+ version: 1.27
Sys::Filesystem::Aix:
file: lib/Sys/Filesystem/Aix.pm
- version: 1.26
+ version: 1.27
Sys::Filesystem::Cygwin:
file: lib/Sys/Filesystem/Cygwin.pm
- version: 1.26
+ version: 1.27
Sys::Filesystem::Darwin:
file: lib/Sys/Filesystem/Darwin.pm
- version: 1.26
+ version: 1.27
Sys::Filesystem::Dummy:
file: lib/Sys/Filesystem/Dummy.pm
- version: 1.26
+ version: 1.27
Sys::Filesystem::Freebsd:
file: lib/Sys/Filesystem/Freebsd.pm
- version: 1.26
+ version: 1.27
Sys::Filesystem::Hpux:
file: lib/Sys/Filesystem/Hpux.pm
- version: 1.26
+ version: 1.27
Sys::Filesystem::Linux:
file: lib/Sys/Filesystem/Linux.pm
- version: 1.26
+ version: 1.27
Sys::Filesystem::Mswin32:
file: lib/Sys/Filesystem/Mswin32.pm
- version: 1.26
+ version: 1.27
Sys::Filesystem::Netbsd:
file: lib/Sys/Filesystem/Netbsd.pm
- version: 1.26
+ version: 1.27
Sys::Filesystem::Solaris:
file: lib/Sys/Filesystem/Solaris.pm
- version: 1.26
+ version: 1.27
Sys::Filesystem::Unix:
file: lib/Sys/Filesystem/Unix.pm
- version: 1.26
+ version: 1.27
recommends:
Test::More: 0
Test::Pod: 0
@@ -59,4 +59,4 @@
perl: 5.006
resources:
license: http://www.apache.org/licenses/LICENSE-2.0.txt
-version: 1.26
+version: 1.27
Modified: trunk/libsys-filesystem-perl/README
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libsys-filesystem-perl/README?rev=53139&op=diff
==============================================================================
--- trunk/libsys-filesystem-perl/README (original)
+++ trunk/libsys-filesystem-perl/README Sun Feb 21 17:13:19 2010
@@ -60,7 +60,7 @@
Specify the full path and filename of the mounted NFS filesystem
table (or xtab for short). This is usually only pertinant to
Unix bases systems. Not all helper modules will query NFS mounts
- as a seperate exercise, and therefore this option may be ignored
+ as a separate exercise, and therefore this option may be ignored
on some systems.
supported
@@ -180,17 +180,17 @@
boot.
check_order()
- Returns the order in which this filesystem should be consistancy
+ Returns the order in which this filesystem should be consistency
checked on boot.
check_frequency()
- Returns how often this filesystem is checked for consistancy.
+ Returns how often this filesystem is checked for consistency.
OS SPECIFIC HELPER MODULES
Dummy
The Dummy module is there to provide a default failover result to the
main Sys::Filesystem module if no suitable platform specific module can
- be found or sucessfully loaded. This is the last module to be tried, in
+ be found or successfully loaded. This is the last module to be tried, in
order of platform, Unix (if not on Win32), and then Dummy.
Unix
@@ -235,7 +235,7 @@
perlport, Solaris::DeviceTree, Win32::DriveInfo
VERSION
- $Id: Filesystem.pm 61 2010-02-12 14:36:11Z trevor $
+ $Id: Filesystem.pm 68 2010-02-19 12:58:40Z trevor $
AUTHOR
Nicola Worthington <nicolaw at cpan.org> - http://perlgirl.org.uk
Modified: trunk/libsys-filesystem-perl/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libsys-filesystem-perl/debian/changelog?rev=53139&op=diff
==============================================================================
--- trunk/libsys-filesystem-perl/debian/changelog (original)
+++ trunk/libsys-filesystem-perl/debian/changelog Sun Feb 21 17:13:19 2010
@@ -1,3 +1,11 @@
+libsys-filesystem-perl (1.27-1) unstable; urgency=low
+
+ * New upstream release.
+ * Drop patch fix-pod-spelling.patch (applied upstream).
+ * Add myself to Uploaders.
+
+ -- Ansgar Burchardt <ansgar at 43-1.org> Mon, 22 Feb 2010 02:13:06 +0900
+
libsys-filesystem-perl (1.26-1) unstable; urgency=low
[ Jonathan Yu ]
Modified: trunk/libsys-filesystem-perl/debian/control
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libsys-filesystem-perl/debian/control?rev=53139&op=diff
==============================================================================
--- trunk/libsys-filesystem-perl/debian/control (original)
+++ trunk/libsys-filesystem-perl/debian/control Sun Feb 21 17:13:19 2010
@@ -7,7 +7,8 @@
libtest-pod-coverage-perl, libparams-util-perl (>= 1.00), libtest-pod-perl,
Maintainer: Debian Perl Group <pkg-perl-maintainers at lists.alioth.debian.org>
Uploaders: Alejandro Garrido Mota <garridomota at gmail.com>,
- Jonathan Yu <jawnsy at cpan.org>, Franck Joncourt <franck at debian.org>
+ Jonathan Yu <jawnsy at cpan.org>, Franck Joncourt <franck at debian.org>,
+ Ansgar Burchardt <ansgar at 43-1.org>
Standards-Version: 3.8.4
Homepage: http://search.cpan.org/dist/Sys-Filesystem/
Vcs-Svn: svn://svn.debian.org/pkg-perl/trunk/libsys-filesystem-perl/
Modified: trunk/libsys-filesystem-perl/lib/Sys/Filesystem.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libsys-filesystem-perl/lib/Sys/Filesystem.pm?rev=53139&op=diff
==============================================================================
--- trunk/libsys-filesystem-perl/lib/Sys/Filesystem.pm (original)
+++ trunk/libsys-filesystem-perl/lib/Sys/Filesystem.pm Sun Feb 21 17:13:19 2010
@@ -1,6 +1,6 @@
############################################################
#
-# $Id: Filesystem.pm 61 2010-02-12 14:36:11Z trevor $
+# $Id: Filesystem.pm 68 2010-02-19 12:58:40Z trevor $
# Sys::Filesystem - Retrieve list of filesystems and their properties
#
# Copyright 2004,2005,2006 Nicola Worthington
@@ -42,9 +42,10 @@
use Scalar::Util qw(blessed);
use constant DEBUG => $ENV{SYS_FILESYSTEM_DEBUG} ? 1 : 0;
-use constant SPECIAL => ( 'darwin' eq $^O ) ? 0 : undef;
-
-$VERSION = '1.26';
+#use constant SPECIAL => ( 'darwin' eq $^O ) ? 0 : undef;
+use constant SPECIAL => undef;
+
+$VERSION = '1.27';
my ( $FsPlugin, $Supported );
@@ -334,7 +335,7 @@
Specify the full path and filename of the mounted NFS filesystem table
(or xtab for short). This is usually only pertinant to Unix bases systems.
-Not all helper modules will query NFS mounts as a seperate exercise, and
+Not all helper modules will query NFS mounts as a separate exercise, and
therefore this option may be ignored on some systems.
=back
@@ -484,12 +485,12 @@
=item check_order()
-Returns the order in which this filesystem should be consistancy checked
+Returns the order in which this filesystem should be consistency checked
on boot.
=item check_frequency()
-Returns how often this filesystem is checked for consistancy.
+Returns how often this filesystem is checked for consistency.
=back
@@ -499,7 +500,7 @@
The Dummy module is there to provide a default failover result to the main
Sys::Filesystem module if no suitable platform specific module can be found
-or sucessfully loaded. This is the last module to be tried, in order of
+or successfully loaded. This is the last module to be tried, in order of
platform, Unix (if not on Win32), and then Dummy.
=head2 Unix
@@ -552,7 +553,7 @@
=head1 VERSION
-$Id: Filesystem.pm 61 2010-02-12 14:36:11Z trevor $
+$Id: Filesystem.pm 68 2010-02-19 12:58:40Z trevor $
=head1 AUTHOR
Modified: trunk/libsys-filesystem-perl/lib/Sys/Filesystem/Aix.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libsys-filesystem-perl/lib/Sys/Filesystem/Aix.pm?rev=53139&op=diff
==============================================================================
--- trunk/libsys-filesystem-perl/lib/Sys/Filesystem/Aix.pm (original)
+++ trunk/libsys-filesystem-perl/lib/Sys/Filesystem/Aix.pm Sun Feb 21 17:13:19 2010
@@ -1,6 +1,6 @@
############################################################
#
-# $Id: Aix.pm 61 2010-02-12 14:36:11Z trevor $
+# $Id: Aix.pm 69 2010-02-19 12:59:04Z trevor $
# Sys::Filesystem - Retrieve list of filesystems and their properties
#
# Copyright 2004,2005,2006 Nicola Worthington
@@ -31,7 +31,7 @@
use Carp qw(croak);
use IO::File;
-$VERSION = '1.26';
+$VERSION = '1.27';
sub version()
{
@@ -327,7 +327,7 @@
=head1 VERSION
-$Id: Aix.pm 61 2010-02-12 14:36:11Z trevor $
+$Id: Aix.pm 69 2010-02-19 12:59:04Z trevor $
=head1 AUTHOR
Modified: trunk/libsys-filesystem-perl/lib/Sys/Filesystem/Cygwin.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libsys-filesystem-perl/lib/Sys/Filesystem/Cygwin.pm?rev=53139&op=diff
==============================================================================
--- trunk/libsys-filesystem-perl/lib/Sys/Filesystem/Cygwin.pm (original)
+++ trunk/libsys-filesystem-perl/lib/Sys/Filesystem/Cygwin.pm Sun Feb 21 17:13:19 2010
@@ -1,6 +1,6 @@
############################################################
#
-# $Id: Cygwin.pm 49 2009-12-05 11:08:35Z trevor $
+# $Id: Cygwin.pm 69 2010-02-19 12:59:04Z trevor $
# Sys::Filesystem - Retrieve list of filesystems and their properties
#
# Copyright 2004,2005,2006 Nicola Worthington
@@ -30,7 +30,7 @@
use Carp qw(croak);
require Sys::Filesystem::Unix;
-$VERSION = '1.26';
+$VERSION = '1.27';
@ISA = qw(Sys::Filesystem::Unix);
sub version()
@@ -133,7 +133,7 @@
=head1 VERSION
-$Id: Cygwin.pm 49 2009-12-05 11:08:35Z trevor $
+$Id: Cygwin.pm 69 2010-02-19 12:59:04Z trevor $
=head1 AUTHOR
Modified: trunk/libsys-filesystem-perl/lib/Sys/Filesystem/Darwin.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libsys-filesystem-perl/lib/Sys/Filesystem/Darwin.pm?rev=53139&op=diff
==============================================================================
--- trunk/libsys-filesystem-perl/lib/Sys/Filesystem/Darwin.pm (original)
+++ trunk/libsys-filesystem-perl/lib/Sys/Filesystem/Darwin.pm Sun Feb 21 17:13:19 2010
@@ -1,6 +1,6 @@
############################################################
#
-# $Id: Darwin.pm 61 2010-02-12 14:36:11Z trevor $
+# $Id: Darwin.pm 73 2010-02-19 13:14:33Z trevor $
# Sys::Filesystem - Retrieve list of filesystems and their properties
#
# Copyright 2004,2005,2006 Nicola Worthington
@@ -34,7 +34,7 @@
use Carp qw(croak);
-$VERSION = '1.26';
+$VERSION = '1.27';
@ISA = qw(Sys::Filesystem::Unix);
sub version()
@@ -44,13 +44,16 @@
my @dt_keys = qw(fs_spec fs_file fs_vfstype fs_name);
my @mount_keys = qw(fs_spec fs_file fs_mntops);
-my %special_fs = qw();
+my %special_fs = (
+ devfs => 1,
+ autofs => 1,
+ );
my $dt_rx = qr/Disk\sAppeared\s+\('([^']+)',\s*
Mountpoint\s*=\s*'([^']+)',\s*
fsType\s*=\s*'([^']*)',\s*
volName\s*=\s*'([^']*)'\)/x;
-my $mount_rx = qr/(.*) on (.*) \((.*)\)/; # /dev/disk on / (hfs,...)
+my $mount_rx = qr/(.*) on (.*) \((\w+),?.*\)/; # /dev/disk on / (hfs,...)
sub new
{
@@ -199,7 +202,7 @@
=head1 VERSION
-$Id: Darwin.pm 61 2010-02-12 14:36:11Z trevor $
+$Id: Darwin.pm 73 2010-02-19 13:14:33Z trevor $
=head1 AUTHOR
Modified: trunk/libsys-filesystem-perl/lib/Sys/Filesystem/Dummy.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libsys-filesystem-perl/lib/Sys/Filesystem/Dummy.pm?rev=53139&op=diff
==============================================================================
--- trunk/libsys-filesystem-perl/lib/Sys/Filesystem/Dummy.pm (original)
+++ trunk/libsys-filesystem-perl/lib/Sys/Filesystem/Dummy.pm Sun Feb 21 17:13:19 2010
@@ -1,6 +1,6 @@
############################################################
#
-# $Id: Dummy.pm 61 2010-02-12 14:36:11Z trevor $
+# $Id: Dummy.pm 69 2010-02-19 12:59:04Z trevor $
# Sys::Filesystem - Retrieve list of filesystems and their properties
#
# Copyright 2004,2005,2006 Nicola Worthington
@@ -27,7 +27,7 @@
use Carp qw(croak);
use vars qw($VERSION);
-$VERSION = '1.26';
+$VERSION = '1.27';
sub version()
{
@@ -72,7 +72,7 @@
=head1 VERSION
-$Id: Dummy.pm 61 2010-02-12 14:36:11Z trevor $
+$Id: Dummy.pm 69 2010-02-19 12:59:04Z trevor $
=head1 AUTHOR
Modified: trunk/libsys-filesystem-perl/lib/Sys/Filesystem/Freebsd.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libsys-filesystem-perl/lib/Sys/Filesystem/Freebsd.pm?rev=53139&op=diff
==============================================================================
--- trunk/libsys-filesystem-perl/lib/Sys/Filesystem/Freebsd.pm (original)
+++ trunk/libsys-filesystem-perl/lib/Sys/Filesystem/Freebsd.pm Sun Feb 21 17:13:19 2010
@@ -1,6 +1,6 @@
############################################################
#
-# $Id: Freebsd.pm 61 2010-02-12 14:36:11Z trevor $
+# $Id: Freebsd.pm 69 2010-02-19 12:59:04Z trevor $
# Sys::Filesystem - Retrieve list of filesystems and their properties
#
# Copyright 2004,2005,2006 Nicola Worthington
@@ -31,7 +31,7 @@
require Sys::Filesystem::Unix;
use Carp qw(croak);
-$VERSION = '1.26';
+$VERSION = '1.27';
@ISA = qw(Sys::Filesystem::Unix);
sub version()
@@ -158,7 +158,7 @@
=head1 VERSION
-$Id: Freebsd.pm 61 2010-02-12 14:36:11Z trevor $
+$Id: Freebsd.pm 69 2010-02-19 12:59:04Z trevor $
=head1 AUTHOR
Modified: trunk/libsys-filesystem-perl/lib/Sys/Filesystem/Hpux.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libsys-filesystem-perl/lib/Sys/Filesystem/Hpux.pm?rev=53139&op=diff
==============================================================================
--- trunk/libsys-filesystem-perl/lib/Sys/Filesystem/Hpux.pm (original)
+++ trunk/libsys-filesystem-perl/lib/Sys/Filesystem/Hpux.pm Sun Feb 21 17:13:19 2010
@@ -1,5 +1,5 @@
# Sys::Filesystem - Retrieve list of filesystems and their properties
-# $Id: Hpux.pm 61 2010-02-12 14:36:11Z trevor $
+# $Id: Hpux.pm 69 2010-02-19 12:59:04Z trevor $
#
# Copyright (c) 2009 H.Merijn Brand, All rights reserved.
# Copyright (c) 2009 Jens Rehsack, All rights reserved.
@@ -30,7 +30,7 @@
use Carp qw(croak);
-$VERSION = '1.26';
+$VERSION = '1.27';
@ISA = qw(Sys::Filesystem::Unix);
sub version()
@@ -100,7 +100,7 @@
=head1 VERSION
-$Id: Hpux.pm 61 2010-02-12 14:36:11Z trevor $
+$Id: Hpux.pm 69 2010-02-19 12:59:04Z trevor $
=head1 AUTHOR
Modified: trunk/libsys-filesystem-perl/lib/Sys/Filesystem/Linux.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libsys-filesystem-perl/lib/Sys/Filesystem/Linux.pm?rev=53139&op=diff
==============================================================================
--- trunk/libsys-filesystem-perl/lib/Sys/Filesystem/Linux.pm (original)
+++ trunk/libsys-filesystem-perl/lib/Sys/Filesystem/Linux.pm Sun Feb 21 17:13:19 2010
@@ -1,6 +1,6 @@
############################################################
#
-# $Id: Linux.pm 61 2010-02-12 14:36:11Z trevor $
+# $Id: Linux.pm 69 2010-02-19 12:59:04Z trevor $
# Sys::Filesystem - Retrieve list of filesystems and their properties
#
# Copyright 2004,2005,2006 Nicola Worthington
@@ -31,7 +31,7 @@
require IO::File;
require Sys::Filesystem::Unix;
-$VERSION = '1.26';
+$VERSION = '1.27';
@ISA = qw(Sys::Filesystem::Unix);
sub version()
@@ -214,7 +214,7 @@
=head1 VERSION
-$Id: Linux.pm 61 2010-02-12 14:36:11Z trevor $
+$Id: Linux.pm 69 2010-02-19 12:59:04Z trevor $
=head1 AUTHOR
Modified: trunk/libsys-filesystem-perl/lib/Sys/Filesystem/Mswin32.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libsys-filesystem-perl/lib/Sys/Filesystem/Mswin32.pm?rev=53139&op=diff
==============================================================================
--- trunk/libsys-filesystem-perl/lib/Sys/Filesystem/Mswin32.pm (original)
+++ trunk/libsys-filesystem-perl/lib/Sys/Filesystem/Mswin32.pm Sun Feb 21 17:13:19 2010
@@ -1,6 +1,6 @@
############################################################
#
-# $Id: Mswin32.pm 61 2010-02-12 14:36:11Z trevor $
+# $Id: Mswin32.pm 69 2010-02-19 12:59:04Z trevor $
# Sys::Filesystem - Retrieve list of filesystems and their properties
#
# Copyright 2004,2005,2006 Nicola Worthington
@@ -30,7 +30,7 @@
use Carp qw(croak);
use vars qw($VERSION);
-$VERSION = '1.26';
+$VERSION = '1.27';
sub version()
{
@@ -113,7 +113,7 @@
=head1 VERSION
-$Id: Mswin32.pm 61 2010-02-12 14:36:11Z trevor $
+$Id: Mswin32.pm 69 2010-02-19 12:59:04Z trevor $
=head1 AUTHOR
Modified: trunk/libsys-filesystem-perl/lib/Sys/Filesystem/Netbsd.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libsys-filesystem-perl/lib/Sys/Filesystem/Netbsd.pm?rev=53139&op=diff
==============================================================================
--- trunk/libsys-filesystem-perl/lib/Sys/Filesystem/Netbsd.pm (original)
+++ trunk/libsys-filesystem-perl/lib/Sys/Filesystem/Netbsd.pm Sun Feb 21 17:13:19 2010
@@ -1,6 +1,6 @@
############################################################
#
-# $Id: Netbsd.pm 61 2010-02-12 14:36:11Z trevor $
+# $Id: Netbsd.pm 75 2010-02-19 13:31:04Z trevor $
# Sys::Filesystem - Retrieve list of filesystems and their properties
#
# Copyright 2009 Jens Rehsack
@@ -29,7 +29,7 @@
require Sys::Filesystem::Unix;
use Carp qw(croak);
-$VERSION = '1.26';
+$VERSION = '1.27';
@ISA = qw(Sys::Filesystem::Unix);
sub version()
@@ -60,7 +60,7 @@
$args{fstab} ||= '/etc/fstab';
my @mounts = qx( /sbin/mount );
- $self->readMounts( $mount_rx, [ 0, 1, 2 ], [qw(fs_spec fs_file fs_vfstype)], \%special_fs, @mounts );
+ $self->readMounts( $mount_rx, [ 0, 1, 2 ], [qw(fs_spec fs_file fs_vfstype fs_mntops)], \%special_fs, @mounts );
$self->readSwap( $swap_rx, qx( /sbin/swapctl -l ) );
unless ( $self->readFsTab( $args{fstab}, \@keys, [ 0, 1, 2 ], \%special_fs ) )
{
@@ -137,7 +137,7 @@
=head1 VERSION
-$Id: Netbsd.pm 61 2010-02-12 14:36:11Z trevor $
+$Id: Netbsd.pm 75 2010-02-19 13:31:04Z trevor $
=head1 AUTHOR
Modified: trunk/libsys-filesystem-perl/lib/Sys/Filesystem/Solaris.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libsys-filesystem-perl/lib/Sys/Filesystem/Solaris.pm?rev=53139&op=diff
==============================================================================
--- trunk/libsys-filesystem-perl/lib/Sys/Filesystem/Solaris.pm (original)
+++ trunk/libsys-filesystem-perl/lib/Sys/Filesystem/Solaris.pm Sun Feb 21 17:13:19 2010
@@ -1,6 +1,6 @@
############################################################
#
-# $Id: Solaris.pm 61 2010-02-12 14:36:11Z trevor $
+# $Id: Solaris.pm 69 2010-02-19 12:59:04Z trevor $
# Sys::Filesystem - Retrieve list of filesystems and their properties
#
# Copyright 2004,2005,2006 Nicola Worthington
@@ -32,7 +32,7 @@
use Data::Dumper;
require Sys::Filesystem::Unix;
-$VERSION = '1.26';
+$VERSION = '1.27';
@ISA = qw(Sys::Filesystem::Unix);
sub version()
@@ -158,7 +158,7 @@
=head1 VERSION
-$Id: Solaris.pm 61 2010-02-12 14:36:11Z trevor $
+$Id: Solaris.pm 69 2010-02-19 12:59:04Z trevor $
=head1 AUTHOR
Modified: trunk/libsys-filesystem-perl/lib/Sys/Filesystem/Unix.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libsys-filesystem-perl/lib/Sys/Filesystem/Unix.pm?rev=53139&op=diff
==============================================================================
--- trunk/libsys-filesystem-perl/lib/Sys/Filesystem/Unix.pm (original)
+++ trunk/libsys-filesystem-perl/lib/Sys/Filesystem/Unix.pm Sun Feb 21 17:13:19 2010
@@ -1,6 +1,6 @@
############################################################
#
-# $Id: Unix.pm 61 2010-02-12 14:36:11Z trevor $
+# $Id: Unix.pm 75 2010-02-19 13:31:04Z trevor $
# Sys::Filesystem - Retrieve list of filesystems and their properties
#
# Copyright 2004,2005,2006 Nicola Worthington
@@ -30,7 +30,7 @@
use IO::File;
use vars qw($VERSION);
-$VERSION = '1.26';
+$VERSION = '1.27';
sub version()
{
@@ -56,8 +56,8 @@
# $args{xtab} ||= '/etc/lib/nfs/xtab';
- $self->readFsTab( $args{fstab}, \@keys, \%special_fs );
- $self->readMntTab( $args{mtab}, \@keys, \%special_fs );
+ $self->readFsTab( $args{fstab}, \@keys, [ 0, 1, 2 ], \%special_fs );
+ $self->readMntTab( $args{mtab}, \@keys, [ 0, 1, 2 ], \%special_fs );
$self;
}
@@ -97,7 +97,7 @@
for ( my $i = 0; $i < @{$fstabKeys}; ++$i )
{
- $self->{ $vals[ $pridx->[1] ] }->{ $fstabKeys->[$i] } = $vals[$i];
+ $self->{ $vals[ $pridx->[1] ] }->{ $fstabKeys->[$i] } = defined( $vals[$i] ) ? $vals[$i] : '';
}
}
$fstab->close();
@@ -146,7 +146,7 @@
for ( my $i = 0; $i < @{$mnttabKeys}; ++$i )
{
- $self->{ $vals[ $pridx->[1] ] }->{ $mnttabKeys->[$i] } = $vals[$i];
+ $self->{ $vals[ $pridx->[1] ] }->{ $mnttabKeys->[$i] } = defined( $vals[$i] ) ? $vals[$i] : '';
}
}
$mtab->close();
@@ -176,17 +176,16 @@
{
my $vfs_type;
$vfs_type = $self->{ $vals[ $pridx->[1] ] }->{fs_vfstype} = $vals[ $pridx->[2] ];
- $self->{ $vals[ $pridx->[1] ] }->{special} = 1 if ( defined( $special->{vfs_types} ) );
- }
- else
- {
- $self->{ $vals[ $pridx->[1] ] }->{special} = 0
- unless ( defined( $self->{ $vals[ $pridx->[1] ] }->{special} ) );
+ $self->{ $vals[ $pridx->[1] ] }->{special} = 1 if ( defined( $special->{$vfs_type} ) );
+ }
+ elsif ( !defined( $self->{ $vals[ $pridx->[1] ] }->{special} ) )
+ {
+ $self->{ $vals[ $pridx->[1] ] }->{special} = 0;
}
for ( my $i = 0; $i < @{$keys}; ++$i )
{
- $self->{ $vals[ $pridx->[1] ] }->{ $keys->[$i] } = $vals[$i];
+ $self->{ $vals[ $pridx->[1] ] }->{ $keys->[$i] } = defined( $vals[$i] ) ? $vals[$i] : '';
}
}
}
@@ -344,7 +343,7 @@
=head1 VERSION
-$Id: Unix.pm 61 2010-02-12 14:36:11Z trevor $
+$Id: Unix.pm 75 2010-02-19 13:31:04Z trevor $
=head1 AUTHOR
Modified: trunk/libsys-filesystem-perl/t/03test.t
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libsys-filesystem-perl/t/03test.t?rev=53139&op=diff
==============================================================================
--- trunk/libsys-filesystem-perl/t/03test.t (original)
+++ trunk/libsys-filesystem-perl/t/03test.t Sun Feb 21 17:13:19 2010
@@ -38,11 +38,12 @@
ok( $special == grep( /^$filesystem$/, @special_filesystems ), 'Special' );
ok( $regular == grep( /^$filesystem$/, @regular_filesystems ), 'Regular' );
- ok( my $device = $fs->device($filesystem), "Get device for $filesystem" );
- ok( my $options = $fs->options($filesystem), "Get options for $filesystem" );
- ok( my $format = $fs->format($filesystem), "Get format for $filesystem" );
- ok( my $volume = $fs->volume($filesystem) || 1, "Get volume type for $filesystem" );
- ok( my $label = $fs->label($filesystem) || 1, "Get label for $filesystem" );
+ my ( $device, $options, $format, $volume, $label );
+ ok( $device = $fs->device($filesystem), "Get device for $filesystem" );
+ ok( defined( $options = $fs->options($filesystem) ), "Get options for $filesystem: $options" );
+ ok( $format = $fs->format($filesystem), "Get format for $filesystem" );
+ ok( $volume = $fs->volume($filesystem) || 1, "Get volume type for $filesystem" );
+ ok( $label = $fs->label($filesystem) || 1, "Get label for $filesystem" );
}
my $device = $fs->device( $filesystems[0] );
More information about the Pkg-perl-cvs-commits
mailing list