diff options
| author | pjd <pjd@FreeBSD.org> | 2011-02-27 19:41:40 +0000 |
|---|---|---|
| committer | pjd <pjd@FreeBSD.org> | 2011-02-27 19:41:40 +0000 |
| commit | 1b03c5bf41222b723415638f03e00ed12cac076a (patch) | |
| tree | ef515cadc08bf427e4d3f1360199ec9827b1596b /cddl/contrib/opensolaris/lib/pyzfs/common/util.py | |
| parent | c67d387baf03726323703774b1b320235fb1f24b (diff) | |
| download | FreeBSD-src-1b03c5bf41222b723415638f03e00ed12cac076a.zip FreeBSD-src-1b03c5bf41222b723415638f03e00ed12cac076a.tar.gz | |
Finally... Import the latest open-source ZFS version - (SPA) 28.
Few new things available from now on:
- Data deduplication.
- Triple parity RAIDZ (RAIDZ3).
- zfs diff.
- zpool split.
- Snapshot holds.
- zpool import -F. Allows to rewind corrupted pool to earlier
transaction group.
- Possibility to import pool in read-only mode.
MFC after: 1 month
Diffstat (limited to 'cddl/contrib/opensolaris/lib/pyzfs/common/util.py')
| -rw-r--r-- | cddl/contrib/opensolaris/lib/pyzfs/common/util.py | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/cddl/contrib/opensolaris/lib/pyzfs/common/util.py b/cddl/contrib/opensolaris/lib/pyzfs/common/util.py index 14d05a8..a33c669 100644 --- a/cddl/contrib/opensolaris/lib/pyzfs/common/util.py +++ b/cddl/contrib/opensolaris/lib/pyzfs/common/util.py @@ -1,4 +1,4 @@ -#! /usr/bin/python2.4 +#! /usr/bin/python2.6 # # CDDL HEADER START # @@ -19,8 +19,7 @@ # # CDDL HEADER END # -# Copyright 2009 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2009, 2010, Oracle and/or its affiliates. All rights reserved. # """This module provides utility functions for ZFS. @@ -29,6 +28,7 @@ zfs.util.dev -- a file object of /dev/zfs """ import gettext import errno import os +import solaris.misc # Note: this module (zfs.util) should not import zfs.ioctl, because that # would introduce a circular dependency @@ -37,8 +37,11 @@ errno.ENOTSUP = 48 dev = open("/dev/zfs", "w") -_ = gettext.translation("SUNW_OST_OSLIB", "/usr/lib/locale", - fallback=True).gettext +try: + _ = gettext.translation("SUNW_OST_OSLIB", "/usr/lib/locale", + fallback=True).gettext +except: + _ = solaris.misc.gettext def default_repr(self): """A simple __repr__ function.""" |
