Commit eaae59ff041b5f2d7f95b7501c3327cefd10abf5 - nautilus-admin

Refresh patches. Debian Janitor 1 year, 8 months ago

2 changed file(s) with 13 addition(s) and 14 deletion(s). Raw diff Collapse all Expand all

-8

debian/patches/compatibility-with-nautilus-43.patch less more

5	5	extension/nautilus-admin.py \| 13 +++++++------
6	6	1 file changed, 7 insertions(+), 6 deletions(-)
7	7
8		diff --git a/extension/nautilus-admin.py b/extension/nautilus-admin.py
9		index 4719bbc..65f6ba6 100644
10		--- a/extension/nautilus-admin.py
11		+++ b/extension/nautilus-admin.py
	8	Index: nautilus-admin/extension/nautilus-admin.py
	9	===================================================================
	10	--- nautilus-admin.orig/extension/nautilus-admin.py
	11	+++ nautilus-admin/extension/nautilus-admin.py
12	12	@@ -18,8 +18,9 @@
13	13	import os, subprocess
14	14

21	21
22	22	from gi.repository import Nautilus, GObject
23	23	from gettext import gettext, bindtextdomain, textdomain
24		@@ -40,9 +41,10 @@ class NautilusAdmin(Nautilus.MenuProvider, GObject.GObject):
	24	@@ -40,9 +41,10 @@ class NautilusAdmin(Nautilus.MenuProvide
25	25	def __init__(self):
26	26	pass
27	27

33	33	# Don't show when already running as root, or when more than 1 file is selected
34	34	if os.geteuid() == ROOT_UID or len(files) != 1:
35	35	return
36		@@ -51,7 +53,6 @@ class NautilusAdmin(Nautilus.MenuProvider, GObject.GObject):
	36	@@ -51,7 +53,6 @@ class NautilusAdmin(Nautilus.MenuProvide
37	37	# Add the menu items
38	38	items = []
39	39	self._setup_gettext();

41	41	if file.get_uri_scheme() == "file": # must be a local file/directory
42	42	if file.is_directory():
43	43	if os.path.exists(NAUTILUS_PATH):
44		@@ -62,9 +63,10 @@ class NautilusAdmin(Nautilus.MenuProvider, GObject.GObject):
	44	@@ -62,9 +63,10 @@ class NautilusAdmin(Nautilus.MenuProvide
45	45
46	46	return items
47	47

53	53	# Don't show when already running as root
54	54	if os.geteuid() == ROOT_UID:
55	55	return
56		@@ -72,7 +74,6 @@ class NautilusAdmin(Nautilus.MenuProvider, GObject.GObject):
	56	@@ -72,7 +74,6 @@ class NautilusAdmin(Nautilus.MenuProvide
57	57	# Add the menu items
58	58	items = []
59	59	self._setup_gettext();

-6

debian/patches/new-python-compat.patch less more

6	6	extension/nautilus-admin.py \| 8 +++++++-
7	7	1 file changed, 7 insertions(+), 1 deletion(-)
8	8
9		diff --git a/extension/nautilus-admin.py b/extension/nautilus-admin.py
10		index 683a484..4719bbc 100644
11		--- a/extension/nautilus-admin.py
12		+++ b/extension/nautilus-admin.py
13		@@ -22,7 +22,13 @@
	9	Index: nautilus-admin/extension/nautilus-admin.py
	10	===================================================================
	11	--- nautilus-admin.orig/extension/nautilus-admin.py
	12	+++ nautilus-admin/extension/nautilus-admin.py
	13	@@ -22,7 +22,13 @@ require_version('Gtk', '3.0')
14	14	require_version('Nautilus', '3.0')
15	15
16	16	from gi.repository import Nautilus, GObject

25	25
26	26	ROOT_UID = 0
27	27	NAUTILUS_PATH="@NAUTILUS_PATH@"
28