From: Dobrica Pavlinusic <dpavlin@rot13.org>
Date: Sun, 28 Nov 2004 20:20:36 +0000 (+0000)
Subject: fixed work-around for non-working fusermount, removed some debugging output
X-Git-Url: http://git.rot13.org/?p=Fuse-DBI;a=commitdiff_plain;h=7555f373deea38c5ede795fd425e227d569c3a63

fixed work-around for non-working fusermount, removed some debugging output


git-svn-id: svn://svn.rot13.org/fuse_dbi/trunk@53 17f4e80c-d0e0-0310-8903-bfc3ae804c12
---

diff --git a/DBI.pm b/DBI.pm
index 3b36596..f8c7907 100755
--- a/DBI.pm
+++ b/DBI.pm
@@ -249,9 +249,11 @@ sub umount {
 	my $self = shift;
 
 	if ($self->{'mount'} && $self->is_mounted) {
-		system "( fusermount -u ".$self->{'mount'}." 2>&1 ) >/dev/null" ||
+		system "( fusermount -u ".$self->{'mount'}." 2>&1 ) >/dev/null";
+		if ($self->is_mounted) {
 			system "sudo umount ".$self->{'mount'} ||
 			return 0;
+		}
 		return 1;
 	}
 
@@ -380,7 +382,7 @@ sub e_getattr {
 
 	# 2 possible types of return values:
 	#return -ENOENT(); # or any other error you care to
-	print "getattr($file) ",join(",",($dev,$ino,$modes,$nlink,$uid,$gid,$rdev,$size,$atime,$mtime,$ctime,$blksize,$blocks)),"\n";
+	#print "getattr($file) ",join(",",($dev,$ino,$modes,$nlink,$uid,$gid,$rdev,$size,$atime,$mtime,$ctime,$blksize,$blocks)),"\n";
 	return ($dev,$ino,$modes,$nlink,$uid,$gid,$rdev,$size,$atime,$mtime,$ctime,$blksize,$blocks);
 }
 
@@ -562,7 +564,7 @@ sub e_statfs {
 
 	my @ret = (255, $inodes, 1, $size, $size-1, BLOCK);
 
-	print "statfs: ",join(",",@ret),"\n";
+	#print "statfs: ",join(",",@ret),"\n";
 
 	return @ret;
 }