View | Details | Raw Unified | Return to bug 43663 | Differences between
and this patch

Collapse All | Expand All

(-)python/de.po (-22 / +27 lines)
 Lines 3-9    Link Here 
3
msgstr ""
3
msgstr ""
4
"Project-Id-Version: univention-lib\n"
4
"Project-Id-Version: univention-lib\n"
5
"Report-Msgid-Bugs-To: packages@univention.de\n"
5
"Report-Msgid-Bugs-To: packages@univention.de\n"
6
"POT-Creation-Date: 2015-05-12 13:18+0200\n"
6
"POT-Creation-Date: 2017-03-01 07:37+0100\n"
7
"PO-Revision-Date: 2016-01-14 11:26+0100\n"
7
"PO-Revision-Date: 2016-01-14 11:26+0100\n"
8
"Last-Translator: Univention GmbH <packages@univention.de>\n"
8
"Last-Translator: Univention GmbH <packages@univention.de>\n"
9
"Language-Team: Univention GmbH <packages@univention.de>\n"
9
"Language-Team: Univention GmbH <packages@univention.de>\n"
 Lines 12-89    Link Here 
12
"Content-Type: text/plain; charset=UTF-8\n"
12
"Content-Type: text/plain; charset=UTF-8\n"
13
"Content-Transfer-Encoding: 8bit\n"
13
"Content-Transfer-Encoding: 8bit\n"
14
14
15
#: python/package_manager.py:751
15
#: python/package_manager.py:782
16
msgid "Autoremove failed"
16
msgid "Autoremove failed"
17
msgstr "Deinstallation unbenutzter Pakete fehlgeschlagen"
17
msgstr "Deinstallation unbenutzter Pakete fehlgeschlagen"
18
18
19
#: python/package_manager.py:691
19
#: python/package_manager.py:701 python/package_manager.py:702
20
msgid "Could not initialize package manager."
20
msgid "Could not initialize package manager."
21
msgstr "Paketmanager konnte nicht initialisiert werden."
21
msgstr "Paketmanager konnte nicht initialisiert werden."
22
22
23
#: python/package_manager.py:745
23
#: python/package_manager.py:776
24
#, python-format
24
#, python-format
25
msgid "Deleting unneeded %s"
25
msgid "Deleting unneeded %s"
26
msgstr "Deinstalliere unbenutztes Paket %s"
26
msgstr "Deinstalliere unbenutztes Paket %s"
27
27
28
#: python/package_manager.py:715
28
#: python/package_manager.py:740
29
msgid "Error: "
29
msgid "Error: "
30
msgstr "Fehler: "
30
msgstr "Fehler: "
31
31
32
#: python/package_manager.py:645
32
#: python/package_manager.py:665
33
msgid "Failed to install"
33
msgid "Failed to install"
34
msgstr "Installation fehlgeschlagen"
34
msgstr "Installation fehlgeschlagen"
35
35
36
#: python/package_manager.py:301 python/package_manager.py:428
36
#: python/package_manager.py:313 python/package_manager.py:445
37
msgid "Failed to lock"
37
msgid "Failed to lock"
38
msgstr "Sperren des Systems fehlgeschlagen"
38
msgstr "Sperren des Systems fehlgeschlagen"
39
39
40
#: python/package_manager.py:650
40
#: python/package_manager.py:670
41
msgid "Failed to uninstall"
41
msgid "Failed to uninstall"
42
msgstr "Deinstallation fehlgeschlagen"
42
msgstr "Deinstallation fehlgeschlagen"
43
43
44
#: python/package_manager.py:425 python/package_manager.py:633
44
#: python/package_manager.py:440 python/package_manager.py:651
45
#, python-format
46
msgid "Fetching failed"
45
msgid "Fetching failed"
47
msgstr "Herunterladen fehlgeschlagen"
46
msgstr "Herunterladen fehlgeschlagen"
48
47
49
#: python/package_manager.py:733
48
#: python/package_manager.py:763
50
msgid "Further information regarding this error:"
49
msgid "Further information regarding this error:"
51
msgstr "Weitere Informationen zu diesem Fehler:"
50
msgstr "Weitere Informationen zu diesem Fehler:"
52
51
53
#: python/package_manager.py:454
52
#: python/package_manager.py:471
54
msgid "No such package"
53
msgid "No such package"
55
msgstr "Paket existiert nicht"
54
msgstr "Paket existiert nicht"
56
55
57
#: python/package_manager.py:724
56
#: python/package_manager.py:753
58
msgid ""
57
msgid ""
59
"Probably another process is currently using it or the package sources are "
58
"Probably another process is currently using it or the package sources are "
60
"corrupt. Please try again later."
59
"corrupt. Please try again later."
61
msgstr "Er wird möglicherweise zurzeit von einem anderen Prozess verwendet oder die Paketquellen sind korrupt. Bitte später erneut versuchen."
60
msgstr ""
61
"Er wird möglicherweise zurzeit von einem anderen Prozess verwendet oder die "
62
"Paketquellen sind korrupt. Bitte später erneut versuchen."
62
63
63
#: python/package_manager.py:722
64
#: python/package_manager.py:751
64
msgid ""
65
msgid ""
65
"Some package conflicts could not be resolved. This was probably caused by "
66
"Some package conflicts could not be resolved. This was probably caused by "
66
"packages with \"hold\" state."
67
"packages with \"hold\" state."
67
msgstr "Einige Paketkonflikte konnten nicht gelöst werden. Dies wird möglicherweise von Paketen mit \"hold\"-Status verursacht."
68
msgstr ""
69
"Einige Paketkonflikte konnten nicht gelöst werden. Dies wird möglicherweise "
70
"von Paketen mit \"hold\"-Status verursacht."
68
71
69
#: python/package_manager.py:727
72
#: python/package_manager.py:756
70
msgid "The package sources are probably corrupt."
73
msgid "The package sources are probably corrupt."
71
msgstr "Die Paketquellen sind wahrscheinlich korrupt."
74
msgstr "Die Paketquellen sind wahrscheinlich korrupt."
72
75
73
#: python/package_manager.py:730
76
#: python/package_manager.py:759
74
msgid ""
77
msgid ""
75
"The sources.list entries could be repaired by executing the following "
78
"The sources.list entries could be repaired by executing the following "
76
"commands as root on this server:"
79
"commands as root on this server:"
77
msgstr "Die sources.list Einträge könnten durch ausführen der folgenden Kommandos als root auf diesem Server repariert werden:"
80
msgstr ""
81
"Die sources.list Einträge könnten durch ausführen der folgenden Kommandos "
82
"als root auf diesem Server repariert werden:"
78
83
79
#: python/package_manager.py:720
84
#: python/package_manager.py:749
80
msgid "There is no free hard disk space left on the device."
85
msgid "There is no free hard disk space left on the device."
81
msgstr "Es ist kein freier Speicherplatz auf dem Gerät verfügbar."
86
msgstr "Es ist kein freier Speicherplatz auf dem Gerät verfügbar."
82
87
83
#: python/package_manager.py:561
88
#: python/package_manager.py:579
84
msgid "Untrusted origin"
89
msgid "Untrusted origin"
85
msgstr "Nicht vertrauenswürdige Quelle"
90
msgstr "Nicht vertrauenswürdige Quelle"
86
91
87
#: python/package_manager.py:714
92
#: python/package_manager.py:739
88
msgid "Warning: "
93
msgid "Warning: "
89
msgstr "Warnung: "
94
msgstr "Warnung: "
(-)python/ldap_extension.py (-6 / +87 lines)
 Lines 175-180    Link Here 
175
				with open(udm_hook_messagecatalog, 'r') as f:
175
				with open(udm_hook_messagecatalog, 'r') as f:
176
					common_udm_options.extend(["--append", "messagecatalog=%s %s" % (language, base64.b64encode(f.read()),), ])
176
					common_udm_options.extend(["--append", "messagecatalog=%s %s" % (language, base64.b64encode(f.read()),), ])
177
177
178
		if self.udm_module_name == "settings/listener":
179
			for servers in options.listenerservers:
180
				common_udm_options.extend(["--append", "servers=%s" % (servers), ])
181
182
		if self.udm_module_name == "settings/ucr_extension":
183
			for servers in options.ucrservers:
184
				common_udm_options.extend(["--append", "servers=%s" % (servers), ])
185
178
		rc, self.object_dn, stdout = self.udm_find_object_dn()
186
		rc, self.object_dn, stdout = self.udm_find_object_dn()
179
		if not self.object_dn:
187
		if not self.object_dn:
180
188
 Lines 785-790    Link Here 
785
		return True
793
		return True
786
794
787
795
796
class UniventionListener(UniventionLDAPExtension):
797
	__metaclass__ = ABCMeta
798
799
	target_container_name = "listener"
800
	udm_module_name = "settings/listener"
801
	active_flag_attribute = "univentionListenerActive"
802
	filesuffix = ".py"
803
804
	#def register(self, filename, options, udm_passthrough_options, target_filename=None):
805
	#	# Determine UDM module name
806
	#	saved_value = sys.dont_write_bytecode
807
	#	sys.dont_write_bytecode = True
808
	#	sys.dont_write_bytecode = saved_value
809
	#
810
	#	UniventionLDAPExtension.register(self, filename, options, udm_passthrough_options, target_filename=module_name + ".py")
811
812
	def wait_for_activation(self, timeout=180):
813
		if not UniventionLDAPExtension.wait_for_activation(self, timeout):
814
			return False
815
816
		timeout = 60
817
		print "Waiting for file %s:" % (self.filename,),
818
		t0 = time.time()
819
		while not os.path.exists(self.filename):
820
			if time.time() - t0 > timeout:
821
				print "ERROR"
822
				print >>sys.stderr, "ERROR: Timout waiting for %s." % (self.filename,)
823
				return False
824
			sys.stdout.write(".")
825
			sys.stdout.flush()
826
			time.sleep(3)
827
		print "OK"
828
		return True
829
830
788
class UniventionUDMModule(UniventionUDMExtension):
831
class UniventionUDMModule(UniventionUDMExtension):
789
	target_container_name = "udm_module"
832
	target_container_name = "udm_module"
790
	udm_module_name = "settings/udm_module"
833
	udm_module_name = "settings/udm_module"
 Lines 846-856    Link Here 
846
889
847
890
848
class UCSOption (Option):
891
class UCSOption (Option):
849
    TYPES = Option.TYPES + ("existing_filename", "ucs_version", )
892
	TYPES = Option.TYPES + ("existing_filename", "ucs_version", )
850
    TYPE_CHECKER = copy(Option.TYPE_CHECKER)
893
	TYPE_CHECKER = copy(Option.TYPE_CHECKER)
851
    TYPE_CHECKER["existing_filename"] = option_validate_existing_filename
894
	TYPE_CHECKER["existing_filename"] = option_validate_existing_filename
852
    TYPE_CHECKER["ucs_version"] = option_validate_ucs_version
895
	TYPE_CHECKER["ucs_version"] = option_validate_ucs_version
853
    TYPE_CHECKER["gnu_message_catalogfile"] = option_validate_gnu_message_catalogfile
896
	TYPE_CHECKER["gnu_message_catalogfile"] = option_validate_gnu_message_catalogfile
854
897
855
898
856
def option_callback_udm_passthrough_options(option, opt_str, value, parser, *args):
899
def option_callback_udm_passthrough_options(option, opt_str, value, parser, *args):
 Lines 927-932    Link Here 
927
			action="append", type="existing_filename", default=[],
970
			action="append", type="existing_filename", default=[],
928
			help="UDM hook", metavar="<filename>")
971
			help="UDM hook", metavar="<filename>")
929
972
973
	parser.add_option("--listener", dest="listener",
974
			action="append", type="existing_filename", default=[],
975
			help="Listener module", metavar="<filename>")
976
977
	parser.add_option("--ucr", dest="ucr",
978
			action="append", type="existing_filename", default=[],
979
			help="UCR extension", metavar="<filename>")
980
930
	parser.add_option("--packagename", dest="packagename",
981
	parser.add_option("--packagename", dest="packagename",
931
			help="Package name")
982
			help="Package name")
932
	parser.add_option("--packageversion", dest="packageversion",
983
	parser.add_option("--packageversion", dest="packageversion",
 Lines 989-994    Link Here 
989
			help="File containing LDAP bindpwd", metavar="<filename>")
1040
			help="File containing LDAP bindpwd", metavar="<filename>")
990
	parser.add_option_group(auth_options)
1041
	parser.add_option_group(auth_options)
991
1042
1043
	listener_options = OptionGroup(parser, "Listener specific options")
1044
	listener_options.add_option("--listenerservers", dest="listenerservers",
1045
			default=[], action="append",
1046
			help="Specify servers (FQDN) on which the listener module has to be installed", metavar='<Servers>')
1047
	parser.add_option_group(listener_options)
1048
1049
	ucr_options = OptionGroup(parser, "UCR specific options")
1050
	ucr_options.add_option("--ucrservers", dest="ucrservers",
1051
			default=[], action="append",
1052
			help="Specify servers (FQDN) on which the UCR extension has to be installed", metavar='<Servers>')
1053
	parser.add_option_group(ucr_options)
1054
992
	opts, args = parser.parse_args()
1055
	opts, args = parser.parse_args()
993
	if len(opts.udm_module) > 1:
1056
	if len(opts.udm_module) > 1:
994
		parser.error('--udm_module option can be given once only.')
1057
		parser.error('--udm_module option can be given once only.')
 Lines 997-1003    Link Here 
997
	if not opts.packageversion:
1060
	if not opts.packageversion:
998
		parser.error('--packageversion option is required.')
1061
		parser.error('--packageversion option is required.')
999
1062
1000
	if not (opts.schemafile or opts.aclfile or opts.udm_syntax or opts.udm_hook or opts.udm_module):
1063
	if not (opts.schemafile or opts.aclfile or opts.udm_syntax or opts.udm_hook or opts.udm_module or opts.listener or opts.ucr):
1001
		parser.print_help()
1064
		parser.print_help()
1002
		sys.exit(2)
1065
		sys.exit(2)
1003
1066
 Lines 1050-1055    Link Here 
1050
			univentionUDMModule.register(udm_module, opts, udm_passthrough_options)
1113
			univentionUDMModule.register(udm_module, opts, udm_passthrough_options)
1051
			objects.append(univentionUDMModule)
1114
			objects.append(univentionUDMModule)
1052
1115
1116
	if opts.listener:
1117
		if UniventionListener.create_base_container(ucr, udm_passthrough_options) != 0:
1118
			sys.exit(1)
1119
1120
		for listener in opts.listener:
1121
			univentionListener = UniventionListener(ucr)
1122
			univentionListener.register(listener, opts, udm_passthrough_options)
1123
			objects.append(univentionListener)
1124
1125
	if opts.ucr:
1126
		if UniventionUCR.create_base_container(ucr, udm_passthrough_options) != 0:
1127
			sys.exit(1)
1128
1129
		for ucrextension in opts.ucr:
1130
			univentionUCR = UniventionUCR(ucr)
1131
			univentionUCR.register(ucrextension, opts, udm_passthrough_options)
1132
			objects.append(univentionUCR)
1133
1053
	for obj in objects:
1134
	for obj in objects:
1054
		if not obj.wait_for_activation():
1135
		if not obj.wait_for_activation():
1055
			print "%s: registraton of %s failed." % (functionname, obj.filename)
1136
			print "%s: registraton of %s failed." % (functionname, obj.filename)

Return to bug 43663