Attachment 2308 Details for Bug 15476

[patch] Parameter immer auswerten

15476_actialise-opts.diff (text/plain), 1.70 KB, created by Philipp Hahn on 2010-02-18 16:06 CET

(hide)

Description:

Filename:

MIME Type:

Creator: Philipp Hahn

Created: 2010-02-18 16:06 CET

Size: 1.70 KB

patch

obsolete

>Index: univention-actualise
>===================================================================
>--- univention-actualise	(Revision 15354)
>+++ univention-actualise	(Arbeitskopie)
>@@ -241,37 +241,35 @@
> 	dist_upgrade = False
> 	check_only = False
> 
>-	try:
>-		if configRegistry.has_key('ldap/hostdn') and configRegistry['ldap/hostdn']:
>+	# parse arguments
>+	for arg in sys.argv[1:]:
>+		if arg == "--silent":
>+			silent = True
>+		elif arg == "-?" or arg=="--help":
>+			print_usage = True
>+		elif arg == "--dist-upgrade":
>+			dist_upgrade = True
>+		elif arg == '--check':
>+			check_only = True
>+		else:
>+			# unknown parameter
>+			print_usage=True
> 
>-			# parse arguments
>-			for arg in sys.argv[1:]:
>-				if arg == "--silent":
>-					silent = True
>-				elif arg == "-?" or arg=="--help":
>-					print_usage = True
>-				elif arg == "--dist-upgrade":
>-					dist_upgrade = True
>-				elif arg == '--check':
>-					check_only = True
>-				else:
>-					# unknown parameter
>-					print_usage=True
>+	if print_usage:
>+		usage()
>+		sys.exit(0)
> 
>-			if print_usage:
>-				usage()
>-				sys.exit(0)
>+	if silent:
>+		# redirect stdout to /dev/null
>+		sys.stdout = open("/dev/null", "w")
> 
>-			if silent:
>-				# redirect stdout to /dev/null
>-				sys.stdout = open("/dev/null", "w")
>+	try:
>+		if check_only:
>+			# Only probe for packages to add/remove
>+			res=check(configRegistry, dist_upgrade)
>+			sys.exit(res)
> 
>-			if check_only:
>-				# Only probe for packages to add/remove
>-				res=check(configRegistry, dist_upgrade)
>-				sys.exit(res)
>-
>-
>+		if configRegistry.has_key('ldap/hostdn') and configRegistry['ldap/hostdn']:
> 			logfile = open( '/var/log/univention/actualise.log', 'a' )
> 			logfile.write('***** Starting univention-actualise at %s\n' % time.ctime())
>

Actions: View | Diff

Attachments on bug 15476: 1827 | 2308