2011-04-27 Erwann Chenede - <erwann.chenede@oracle.com>

  * VERSION: Bump to 0.2.98
  * usr/share/time-slider/lib/time_slider/applet.py
    usr/share/time-slider/lib/time_slider/deletegui.py
    usr/share/time-slider/lib/time_slider/setupgui.py
    usr/share/time-slider/lib/time_slider/snapnowui.py
    usr/share/time-slider/lib/time_slider/timesliderd.py :
    Fix for 7038498 removed Primary Administrator references

  * usr/share/time-slider/lib/time_slider/util.py
    usr/share/time-slider/lib/time_slider/zfs.py :
    Fix for 6996354 gracefully handle snapshot failure

ChangeLog

@@ -1,3 +1,17 @@
+2011-04-27 Erwann Chenede - <erwann.chenede@oracle.com>
+
+	* VERSION: Bump to 0.2.98
+	* usr/share/time-slider/lib/time_slider/applet.py
+	  usr/share/time-slider/lib/time_slider/deletegui.py
+	  usr/share/time-slider/lib/time_slider/setupgui.py
+	  usr/share/time-slider/lib/time_slider/snapnowui.py
+	  usr/share/time-slider/lib/time_slider/timesliderd.py :
+	  Fix for 7038498 removed Primary Administrator references
+
+	* usr/share/time-slider/lib/time_slider/util.py
+	  usr/share/time-slider/lib/time_slider/zfs.py : 
+	  Fix for 6996354 gracefully handle snapshot failure
+
 2010-07-29 Niall Power - <niall.power@oracle.com>
 
 	* VERSION: Bump to 0.2.97

VERSION

@@ -1 +1 @@
-VERSION = 0.2.97
+VERSION = 0.2.98

usr/share/time-slider/lib/time_slider/applet.py

@@ -130,16 +130,11 @@ def __init__(self, icon, menu):
         # Use this variable to keep track of it's running status.
         self._scriptRunning = False
         self._targetDirAvail = False
-        # If the user is authorised, allow them to manually synchronise
-        # rsync backups.
-        self._syncNowItem = None
-        if os.geteuid() == 0 or \
-            rbac.RBACprofile().has_profile("Primary Administrator"):
-            self._syncNowItem = gtk.MenuItem(_("Update Backups Now"))
-            self._syncNowItem.set_sensitive(False)
-            self._syncNowItem.connect("activate",
-                                      self._sync_now)
-            self._menu.append(self._syncNowItem)
+        self._syncNowItem = gtk.MenuItem(_("Update Backups Now"))
+        self._syncNowItem.set_sensitive(False)
+        self._syncNowItem.connect("activate",
+                                  self._sync_now)
+        self._menu.append(self._syncNowItem)
 
         self.refresh()
 
@@ -427,17 +422,22 @@ def refresh(self):
             self._syncNowItem.hide()
 
     def _sync_now(self, menuItem):
-        """Runs the rsync-bacjup script manually
-           Assumes that user is either root or has the 
-           Primary Administrator profile since it is only
-           called from the menu item which is invisilbe to
+        """Runs the rsync-backup script manually
+           Assumes that user is root since it is only
+           called from the menu item which is invisible to
            not authorised users
         """
         cmdPath = os.path.join(os.path.dirname(sys.argv[0]), \
                                "time-slider/plugins/rsync/rsync-backup")
-        cmd = ["/usr/bin/pfexec", cmdPath, \
-               "%s:rsync" % (plugin.PLUGINBASEFMRI)]
-        subprocess.Popen(cmd, close_fds=True, cwd="/")
+        if os.geteuid() == 0:
+	  cmd = [cmdPath, \
+		 "%s:rsync" % (plugin.PLUGINBASEFMRI)]
+	else:
+	  cmd = ['/usr/bin/gksu' ,cmdPath, \
+		 "%s:rsync" % (plugin.PLUGINBASEFMRI)]
+
+	subprocess.Popen(cmd, close_fds=True, cwd="/")
+
 
 class CleanupNote(Note):
 

usr/share/time-slider/lib/time_slider/deletegui.py

@@ -732,16 +732,6 @@ def main(argv):
         glib.idle_add(manager.initialise_view)
         gtk.main()
         gtk.gdk.threads_leave()
-    elif rbacp.has_profile("Primary Administrator") or \
-            rbacp.has_profile("ZFS File System Management"):
-        # Run via pfexec, which will launch the GUI as superuser
-        arguments = []
-        arguments.append ("pfexec")
-        arguments.append (argv)
-        arguments += args
-        os.execv("/usr/bin/pfexec", arguments)
-        # Shouldn't reach this point
-        sys.exit(1)
     elif os.path.exists(argv) and os.path.exists("/usr/bin/gksu"):
         # Run via gksu, which will prompt for the root password
         newargs = ["gksu", argv]

usr/share/time-slider/lib/time_slider/setupgui.py

@@ -1291,21 +1291,14 @@ def main(argv):
     # This GUI can be launched with an euid of root in one of
     # the following 3 ways;
     # 0. Run by the superuser (root)
-    # 1. Run by a user assigned "Primary Administrator" profile.
-    # 3. Run via gksu to allow a non priviliged user to authenticate
+    # 1. Run via gksu to allow a non priviliged user to authenticate
     #    as the superuser (root)
 
     if os.geteuid() == 0:
         manager = SetupManager(argv)
         gtk.gdk.threads_enter()
         gtk.main()
         gtk.gdk.threads_leave()
-    elif rbacp.has_profile("Primary Administrator"):
-        # Run via pfexec, which will launch the GUI as superuser
-        os.unsetenv("DBUS_SESSION_BUS_ADDRESS")
-        os.execl("/usr/bin/pfexec", "pfexec", argv)
-        # Shouldn't reach this point
-        sys.exit(1)
     elif os.path.exists(argv) and os.path.exists("/usr/bin/gksu"):
         # Run via gksu, which will prompt for the root password
         os.unsetenv("DBUS_SESSION_BUS_ADDRESS")

usr/share/time-slider/lib/time_slider/snapnowui.py

@@ -195,8 +195,7 @@ def main(argv):
     # - 1 or 4
     # Note that an effective UID=0 will match any profile search so
     # no need to check it explicitly.
-    if rbacp.has_profile("Primary Administrator") or \
-            rbacp.has_profile("ZFS File System Management"):
+    if rbacp.has_profile("ZFS File System Management"):
 	manager = SnapshotNowDialog(args[0],args[1])
         gtk.main()
     elif os.path.exists(argv) and os.path.exists("/usr/bin/gksu"):

usr/share/time-slider/lib/time_slider/timesliderd.py

@@ -939,7 +939,6 @@ def main(argv):
     create_daemon()
 
     # The user security attributes checked are the following:
-    # 1. The "Primary Administrator" profile
     # Note that UID == 0 will match any profile search so
     # no need to check it explicitly.
     syslog.openlog("time-sliderd", 0, syslog.LOG_DAEMON)

usr/share/time-slider/lib/time_slider/util.py

@@ -28,7 +28,7 @@
 import math
 import gio
 
-def run_command(command):
+def run_command(command, raise_on_try=True):
     """
     Wrapper function around subprocess.Popen
     Returns a tuple of standard out and stander error.
@@ -45,7 +45,7 @@ def run_command(command):
     except OSError, message:
         raise RuntimeError, "%s subprocess error:\n %s" % \
                             (command, str(message))
-    if err != 0:
+    if err != 0 and raise_on_try:
         raise RuntimeError, '%s failed with exit code %d\n%s' % \
                             (str(command), err, errdata)
     return outdata,errdata

usr/share/time-slider/lib/time_slider/zfs.py

@@ -856,7 +856,9 @@ def create_snapshot(self, snaplabel, recursive = False):
         if recursive == True:
             cmd.append("-r")
         cmd.append("%s@%s" % (self.name, snaplabel))
-        outdata,errdata = util.run_command(cmd)
+        outdata,errdata = util.run_command(cmd, False)
+	if errdata:
+	  print errdata
         self.datasets.refresh_snapshots()
 
     def list_children(self):
@@ -1045,4 +1047,3 @@ def list_zpools():
                 snap = Snapshot(snapshot, snaptime)
                 print "\t\t" + snap.name
 
-