Attachment 7798 Details for Bug 41261 – suggestions.patch

[patch] suggestions.patch

suggestions.patch (text/plain), 2.00 KB, created by Arvid Requate on 2016-07-13 13:14:17 CEST

(hide)

Description:

Filename:

MIME Type:

Creator: Arvid Requate

Created: 2016-07-13 13:14:17 CEST

Size: 2.00 KB

patch

obsolete

>Index: doc.34355/test30_case_difference
>===================================================================
>--- doc.34355/test30_case_difference	(Revision 70669)
>+++ doc.34355/test30_case_difference	(Arbeitskopie)
>@@ -19,7 +19,7 @@
> 	done
> }
> check_tx () {
>-	local dn="${1},${BASE}" cmd="${2-[amdrn]}"
>+	local dn="${1},${BASE}" cmd="${2:-[amdrn]}"
> 	wait_listener
> 	grep -x "[0-9]\+ ${dn} ${cmd}" <&4
> }
>Index: python/get_notifier_id.py
>===================================================================
>--- python/get_notifier_id.py	(Revision 70669)
>+++ python/get_notifier_id.py	(Arbeitskopie)
>@@ -55,7 +55,11 @@
> 
>     if not options.master:
>         if args:
>-            options.master, = args
>+			try:
>+				options.master, = args
>+			except ValueError:
>+				parser.print_usage()
>+				sys.exit(2)
>         else:
>             from univention.config_registry import ConfigRegistry
>             configRegistry = ConfigRegistry()
>@@ -63,7 +67,7 @@
>             options.master = configRegistry.get('ldap/master')
> 
>     if not options.master:
>-        parser.error('ldap/master or --host not set')
>+        parser.error('ldap/master or --master not set')
> 
>     return options
> 
>Index: src/dump.c
>===================================================================
>--- src/dump.c	(Revision 70669)
>+++ src/dump.c	(Arbeitskopie)
>@@ -140,9 +140,9 @@
> 			rv=cache_next_entry(&cur, &dn, &entry)) {
> 		if ((rv == 0 && !broken_only) || (rv == -1 && broken_only)) {
> 			cache_dump_entry(dn, &entry, fp);
>-			cache_free_entry(&dn, &entry);
> 			fprintf(fp, "\n");
> 		}
>+		cache_free_entry(&dn, &entry);
> 		if (rv < -1) break;
> 	}
> 	cache_free_cursor(cur);
>Index: src/notifier.c
>===================================================================
>--- src/notifier.c	(Revision 70669)
>+++ src/notifier.c	(Arbeitskopie)
>@@ -100,6 +100,7 @@
> 	for (;;) {
> 		int		msgid;
> 		time_t		timeout = DELAY_LDAP_CLOSE;
>+		univention_debug(UV_DEBUG_LISTENER, UV_DEBUG_INFO, "Last Notifier ID: %lu", id);
> 
> 		if ((msgid = notifier_get_dn(NULL, id + 1)) < 1)
> 			break;

Actions: View | Diff

Attachments on bug 41261: 7653 | 7654 | 7798