Mercurial Mercurial > sustaining > oi_151a > spec-files / annotate
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
patches/glib-06-dont-show-zfs.diff
author padraig
Wed, 09 Jul 2008 08:14:39 +0000
changeset 12777 ceb1f5120e21
child 12780 eccad06df4cc
permissions -rw-r--r--
2008-07-09 Padraig O'Briain <[email protected]> * patches/glib-06-dont-show-zfs.diff: Dont show mounted ZFS file systems. http://defect.opensolaris.org/bz/show_bug.cgi?id=2327 * base-specs/glib2.spec: added patch
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
12777
ceb1f5120e21 2008-07-09 Padraig O'Briain <[email protected]>
padraig
parents:
diff changeset 
     1
 
--- /usr/tmp/clean/glib-2.17.3/gio/gunixmounts.c	2008-07-02 22:13:13.000000000 +0100
ceb1f5120e21 2008-07-09 Padraig O'Briain <[email protected]>
padraig
parents:
diff changeset 
     2
 
+++ glib-2.17.3/gio/gunixmounts.c	2008-07-09 08:48:21.894152000 +0100
ceb1f5120e21 2008-07-09 Padraig O'Briain <[email protected]>
padraig
parents:
diff changeset 
     3
 
@@ -1906,7 +1906,8 @@
ceb1f5120e21 2008-07-09 Padraig O'Briain <[email protected]>
padraig
parents:
diff changeset 
     4
 
         return TRUE;
ceb1f5120e21 2008-07-09 Padraig O'Briain <[email protected]>
padraig
parents:
diff changeset 
     5
 
       }
ceb1f5120e21 2008-07-09 Padraig O'Briain <[email protected]>
padraig
parents:
diff changeset 
     6
ceb1f5120e21 2008-07-09 Padraig O'Briain <[email protected]>
padraig
parents:
diff changeset 
     7
 
-      if (g_str_has_prefix (mount_path, g_get_home_dir ()) && mount_path[strlen (g_get_home_dir())] == G_DIR_SEPARATOR)
ceb1f5120e21 2008-07-09 Padraig O'Briain <[email protected]>
padraig
parents:
diff changeset 
     8
 
+      if (g_str_has_prefix (mount_path, g_get_home_dir ()) && mount_path[strlen (g_get_home_dir())] == G_DIR_SEPARATOR  && strcmp ("zfs", mount_entry->filesyste
ceb1f5120e21 2008-07-09 Padraig O'Briain <[email protected]>
padraig
parents:
diff changeset 
     9
 
+m_type) != 0)
ceb1f5120e21 2008-07-09 Padraig O'Briain <[email protected]>
padraig
parents:
diff changeset 
    10
 
         return TRUE;
ceb1f5120e21 2008-07-09 Padraig O'Briain <[email protected]>
padraig
parents:
diff changeset 
    11
 
     }
ceb1f5120e21 2008-07-09 Padraig O'Briain <[email protected]>
padraig
parents:
diff changeset 
    12
sustaining/oi_151a/spec-files