Permalink
Browse files

Apply version 0.2.101 changes found at http://src.opensolaris.org/sou…

  • Loading branch information...
1 parent d518b00 commit 44d17bef20a0a99a1dc6a38d0bf4320c205219a7 @aszeszo committed Mar 17, 2012
View
12 ChangeLog
@@ -1,3 +1,15 @@
+2012-01-25 Padraig O'Briain - <padraig.obriain@oracle.com>
+
+ * usr/share/time-slider/lib/plugin/zfssend/zfssend.py:
+ Fix for 7065464
+ * VERSION: bumped to 0.2.101
+
+2012-01-18 Padraig O'Briain - <padraig.obriain@oracle.com>
+
+ * usr/share/time-slider/lib/time-sliderd.py:
+ Fix for 7064327
+ * VERSION: bumped to 0.2.100
+
2011-07-29 Erwann Chenede - <erwann.chenede@oracle.com>
* var/*: moved to lib for 6939144
View
2 VERSION
@@ -1 +1 @@
-VERSION = 0.2.99
+VERSION = 0.2.101
View
6 usr/share/time-slider/lib/plugin/zfssend/zfssend.py
@@ -26,9 +26,7 @@
import syslog
from bisect import insort
-import time_slider.util
-import time_slider.smf
-import time_slider.zfs
+from time_slider import util, smf, zfs
# Set to True if SMF property value of "plugin/command" is "true"
verboseprop = "plugin/verbose"
@@ -152,7 +150,7 @@ def main(argv):
prevlabel = ds.get_user_property(propname)
snapname = "%s@%s" % (ds.name, snaplabel)
- if (prevlabel == None or len(prevlabel) == 0):
+ if (prevlabel == None or prevlabel == '-' or len(prevlabel) == 0):
# No previous backup - send a full replication stream
sendcmd = [zfs.ZFSCMD, "send", snapname]
util.debug("No previous backup registered for %s" % ds.name, verbose)
View
2 usr/share/time-slider/lib/time_slider/timesliderd.py
@@ -673,7 +673,7 @@ def _perform_cleanup(self):
util.debug("%s pool status after cleanup:" \
% zpool.name, \
self.verbose)
- util.debug(zpool, self.verbose)
+ util.debug(zpool.name, self.verbose)
util.debug("Cleanup completed. %d snapshots were destroyed" \
% len(self._destroyedsnaps), \
self.verbose)

0 comments on commit 44d17be

Please sign in to comment.