Commit 4c22b7952d80c2cd96bef9455dc0faaf9a34600c - nautilus-admin

Refresh patches. Debian Janitor 1 year, 7 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 \| 10 ++++------
6	6	1 file changed, 4 insertions(+), 6 deletions(-)
7	7
8		diff --git a/extension/nautilus-admin.py b/extension/nautilus-admin.py
9		index 4719bbc..2ca77a9 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,6 @@
13	13	import os, subprocess
14	14

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

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

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

50	50	# Don't show when already running as root
51	51	if os.geteuid() == ROOT_UID:
52	52	return
53		@@ -72,7 +71,6 @@ class NautilusAdmin(Nautilus.MenuProvider, GObject.GObject):
	53	@@ -72,7 +71,6 @@ class NautilusAdmin(Nautilus.MenuProvide
54	54	# Add the menu items
55	55	items = []
56	56	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