git://git.camperquake.de
/
time-slider.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Initial attempt at python3 conversion
[time-slider.git]
/
usr
/
share
/
time-slider
/
lib
/
time_slider
/
snapnowui.py
diff --git
a/usr/share/time-slider/lib/time_slider/snapnowui.py
b/usr/share/time-slider/lib/time_slider/snapnowui.py
old mode 100755
(executable)
new mode 100644
(file)
index
9e6c7c4
..
441123f
--- a/
usr/share/time-slider/lib/time_slider/snapnowui.py
+++ b/
usr/share/time-slider/lib/time_slider/snapnowui.py
@@
-1,4
+1,4
@@
-#!/usr/bin/python2
.6
+#!/usr/bin/python2
#
# CDDL HEADER START
#
#
# CDDL HEADER START
#
@@
-62,8
+62,8
@@
GETTEXT_DOMAIN = 'time-slider'
gtk.glade.bindtextdomain(GETTEXT_DOMAIN, LOCALE_PATH)
gtk.glade.textdomain(GETTEXT_DOMAIN)
gtk.glade.bindtextdomain(GETTEXT_DOMAIN, LOCALE_PATH)
gtk.glade.textdomain(GETTEXT_DOMAIN)
-import zfs
-from rbac import RBACprofile
+
from .
import zfs
+from
.
rbac import RBACprofile
class SnapshotNowDialog:
class SnapshotNowDialog:
@@
-132,7
+132,7
@@
class SnapshotNowDialog:
name = self.snap_name_entry.get_text()
valid_name = self.validate_name (name, True)
if name == valid_name:
name = self.snap_name_entry.get_text()
valid_name = self.validate_name (name, True)
if name == valid_name:
- cmd = "
pfexec
/usr/sbin/zfs snapshot %s@%s" % (self.zfs_fs, self.validate_name (self.snap_name_entry.get_text()))
+ cmd = "/usr/sbin/zfs snapshot %s@%s" % (self.zfs_fs, self.validate_name (self.snap_name_entry.get_text()))
fin,fout,ferr = os.popen3(cmd)
# Check for any error output generated and
# return it to caller if so.
fin,fout,ferr = os.popen3(cmd)
# Check for any error output generated and
# return it to caller if so.
@@
-219,6
+219,6
@@
def main(argv):
"administrative priviliges."
"\n\nConsult your system administrator "))
dialog.run()
"administrative priviliges."
"\n\nConsult your system administrator "))
dialog.run()
- print
argv + "is not a valid executable path"
+ print
(argv + "is not a valid executable path")
sys.exit(1)
sys.exit(1)