[SCM] dpkg's main repository branch, master, updated. 1.16.2-106-gfd35aec

[Guillem Jover]

The following commit has been merged in the master branch:
commit 0e13a18f4768f8c0f3b3660c1c810086007cc975
Author: Guillem Jover <guil...@debian.org>
Date:   Mon Apr 16 03:42:21 2012 +0200

    u-a: Rename altdb_interrupt_parsing() to altdb_parse_stop()

diff --git a/utils/update-alternatives.c b/utils/update-alternatives.c
index b0867d4..d9c781c 100644
--- a/utils/update-alternatives.c
+++ b/utils/update-alternatives.c
@@ -1135,7 +1135,7 @@ altdb_parse_error(struct altdb_context *ctx, const char 
*format, ...)
 }
 
 static void DPKG_ATTR_NORET DPKG_ATTR_PRINTF(2)
-altdb_interrupt_parsing(struct altdb_context *ctx, const char *format, ...)
+altdb_parse_stop(struct altdb_context *ctx, const char *format, ...)
 {
        longjmp(ctx->on_error, 1);
 }
@@ -1267,7 +1267,7 @@ alternative_load(struct alternative *a, bool must_not_die)
                return false;
        }
        if (must_not_die)
-               ctx.bad_format = altdb_interrupt_parsing;
+               ctx.bad_format = altdb_parse_stop;
        else
                ctx.bad_format = altdb_parse_error;
        xasprintf(&fn, "%s/%s", admdir, a->master_name);

-- 
dpkg's main repository


-- 
To UNSUBSCRIBE, email to debian-dpkg-cvs-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org