X-Git-Url: https://git.camperquake.de/gitweb.cgi?p=time-slider.git;a=blobdiff_plain;f=usr%2Fshare%2Ftime-slider%2Flib%2Fplugin%2Fzfssend%2Fzfssend.py;h=12e1ff5bd98800aa9c0a5ba3a6d49d2f7415f22e;hp=42f39759bd232aaf49fb77b3338f3ad514f47902;hb=75feb72a4aa1bf0940b4b2eaddd68c781cdf50ee;hpb=d021224696e8524cab857c27370e33aeaf024130

diff --git a/usr/share/time-slider/lib/plugin/zfssend/zfssend.py b/usr/share/time-slider/lib/plugin/zfssend/zfssend.py
index 42f3975..12e1ff5 100644
--- a/usr/share/time-slider/lib/plugin/zfssend/zfssend.py
+++ b/usr/share/time-slider/lib/plugin/zfssend/zfssend.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python2.6
+#!/usr/bin/python2
 #
 # CDDL HEADER START
 #
@@ -33,7 +33,7 @@ import time_slider.zfs
 # Set to True if SMF property value of "plugin/command" is "true"
 verboseprop = "plugin/verbose"
 propbasename = "org.opensolaris:time-slider-plugin"
-print _("Do I work?")
+print(_("Do I work?"))
 
 def main(argv):
 
@@ -129,7 +129,7 @@ def main(argv):
     # Check to see if the receive command is accessible and executable
     try:
         statinfo = os.stat(recvcmd[0])
-        other_x = (statinfo.st_mode & 01)
+        other_x = (statinfo.st_mode & 0o1)
         if other_x == 0:
             log_error(syslog.LOG_ERR,
                       "Plugin: %s: Configured receive/command is not " \
@@ -177,12 +177,6 @@ def main(argv):
                 sys.exit(-1)
         
         
-        # Invoke the send and receive commands via pfexec(1) since
-        # we are not using the role's shell to take care of that
-        # for us.
-        sendcmd.insert(0, smf.PFCMD)
-        recvcmd.insert(0, smf.PFCMD)
-
         try:
             sendP = subprocess.Popen(sendcmd,
                                      stdout=subprocess.PIPE,
@@ -199,13 +193,13 @@ def main(argv):
             senderrno = sendP.wait()
 
             if senderrno != 0:
-                raise RuntimeError, "Send command: %s failed with exit code" \
+                raise RuntimeError("Send command: %s failed with exit code" \
                                     "%d. Error message: \n%s" \
-                                    % (str(sendcmd), senderrno, senderr)
+                                    % (str(sendcmd), senderrno, senderr))
             if recverrno != 0:
-                raise RuntimeError, "Receive command %s failed with exit " \
+                raise RuntimeError("Receive command %s failed with exit " \
                                     "code %d. Error message: \n%s" \
-                                    % (str(recvcmd), recverrno, recverr)
+                                    % (str(recvcmd), recverrno, recverr))
 
             if prevsnapname != None:
                 util.debug("Releasing hold on %s" % (prevsnapname), verbose)
@@ -214,7 +208,7 @@ def main(argv):
                       % (prevsnapname),
                       verbose)
                 snapshot.release(propname)
-        except Exception, message:
+        except Exception as message:
             log_error(syslog.LOG_ERR,
                       "Error during snapshot send/receive operation: %s" \
                       % (message))