Merge lp:~ubuntu-branches/ubuntu/raring/libnih/raring-201210281506 into lp:ubuntu/raring/libnih

[Ubuntu Package Importer]

The package importer has detected a possible inconsistency between the package history in the archive and the history in bzr. As the archive is authoritative the importer has made lp:ubuntu/raring/libnih reflect what is in the archive and the old bzr branch has been pushed to lp:~ubuntu-branches/ubuntu/raring/libnih/raring-201210281506. This merge proposal was created so that an Ubuntu developer can review the situations and perform a merge/upload if necessary. There are three typical cases where this can happen.
  1. Where someone pushes a change to bzr and someone else uploads the package without that change. This is the reason that this check is done by the importer. If this appears to be the case then a merge/upload should be done if the changes that were in bzr are still desirable.
  2. The importer incorrectly detected the above situation when someone made a change in bzr and then uploaded it.
  3. The importer incorrectly detected the above situation when someone just uploaded a package and didn't touch bzr.

If this case doesn't appear to be the first situation then set the status of the merge proposal to "Rejected" and help avoid the problem in future by filing a bug at https://bugs.launchpad.net/udd linking to this merge proposal.

(this is an automatically generated message)

Unmerged revisions

1067. By James Hunt on 2012-10-25

* nih/logging.c: Use our own __nih_abort_msg rather than the (e)glibc
  private symbol __abort_msg to avoid upgrade issues (LP: #997359).
* nih/tests/test_logging.c: Update tests for __nih_abort_msg.
* nih-dbus-tool/tests/test_property.c: Compiler appeasement.
* nih/tests/test_hash.c: Compiler appeasement.
* nih/tests/test_main.c: Compiler appeasement.
* nih/tests/test_option.c: Compiler appeasement.

=== modified file 'debian/changelog'
--- debian/changelog	2012-10-25 10:57:30 +0000
+++ debian/changelog	2012-10-28 15:15:26 +0000
@@ -1,11 +1,26 @@
-libnih (1.0.3-4ubuntu12) raring; urgency=low
-
-  * nih/logging.c: Use our own __nih_abort_msg rather than the (e)glibc
-    private symbol __abort_msg to avoid upgrade issues (LP: #997359).
-  * nih/tests/test_logging.c: Update tests for __nih_abort_msg.
-
- -- James Hunt <[e-mail]>  Thu, 25 Oct 2012 10:57:30 +0100
-
+<<<<<<< TREE
+libnih (1.0.3-4ubuntu12) raring; urgency=low
+
+  * nih/logging.c: Use our own __nih_abort_msg rather than the (e)glibc
+    private symbol __abort_msg to avoid upgrade issues (LP: #997359).
+  * nih/tests/test_logging.c: Update tests for __nih_abort_msg.
+
+ -- James Hunt <[e-mail]>  Thu, 25 Oct 2012 10:57:30 +0100
+
+=======
+libnih (1.0.3-4ubuntu12) raring; urgency=low
+
+  * nih/logging.c: Use our own __nih_abort_msg rather than the (e)glibc
+    private symbol __abort_msg to avoid upgrade issues (LP: #997359).
+  * nih/tests/test_logging.c: Update tests for __nih_abort_msg.
+  * nih-dbus-tool/tests/test_property.c: Compiler appeasement.
+  * nih/tests/test_hash.c: Compiler appeasement.
+  * nih/tests/test_main.c: Compiler appeasement.
+  * nih/tests/test_option.c: Compiler appeasement.
+
+ -- James Hunt <[e-mail]>  Thu, 25 Oct 2012 10:57:30 +0100
+
+>>>>>>> MERGE-SOURCE
 libnih (1.0.3-4ubuntu11) quantal; urgency=low
 
   * Addition of debian/libnih-dbus1.postinst and

=== modified file 'nih-dbus-tool/tests/test_property.c'
--- nih-dbus-tool/tests/test_property.c	2010-02-04 22:30:23 +0000
+++ nih-dbus-tool/tests/test_property.c	2012-10-28 15:15:26 +0000
@@ -8733,7 +8733,7 @@
 	TypeVar *       var;
 	NihListEntry *  attrib;
 	NihDBusProxy *  proxy = NULL;
-	void *          parent = NULL;
+	void *          parent __attribute__((__unused__)) = NULL;
 	pid_t           pid = -1;
 	int             status;
 	DBusMessage *   method_call;

=== modified file 'nih/logging.c'
--- nih/logging.c	2012-10-25 10:57:30 +0000
+++ nih/logging.c	2012-10-28 15:15:26 +0000
@@ -43,7 +43,11 @@
  *
  * A variable that keeps the assertion message in the core dump.
  **/
+<<<<<<< TREE
 char *__nih_abort_msg;
+=======
+char *__nih_abort_msg = NULL;
+>>>>>>> MERGE-SOURCE
 
 /**
  * logger:
@@ -120,6 +124,7 @@
 static void
 nih_log_abort_message (const char *message)
 {
+<<<<<<< TREE
 	if (! &__nih_abort_msg)
 		return;
 
@@ -127,6 +132,12 @@
 		nih_discard (__nih_abort_msg);
 
 	__nih_abort_msg = NIH_MUST (nih_strdup (NULL, message));
+=======
+	if (__nih_abort_msg)
+		nih_discard (__nih_abort_msg);
+
+	__nih_abort_msg = NIH_MUST (nih_strdup (NULL, message));
+>>>>>>> MERGE-SOURCE
 }
 
 /**

=== modified file 'nih/tests/test_hash.c'
--- nih/tests/test_hash.c	2010-02-04 22:30:23 +0000
+++ nih/tests/test_hash.c	2012-10-28 15:15:26 +0000
@@ -470,7 +470,8 @@
 test_lookup (void)
 {
 	NihHash *hash;
-	NihList *entry1, *entry2, *entry3, *ptr;
+	NihList *entry1, *entry2, *ptr;
+	NihList *entry3 __attribute__((__unused__));
 
 	TEST_FUNCTION ("nih_hash_lookup");
 	hash = nih_hash_string_new (NULL, 0);

=== modified file 'nih/tests/test_logging.c'
--- nih/tests/test_logging.c	2012-10-25 10:57:30 +0000
+++ nih/tests/test_logging.c	2012-10-28 15:15:26 +0000
@@ -159,6 +159,7 @@
 	/* Check that a fatal message is also stored in the __nih_abort_msg
 	 * variable.
 	 */
+<<<<<<< TREE
 	if (&__nih_abort_msg) {
 		TEST_FEATURE ("with fatal message");
 		TEST_ALLOC_FAIL {
@@ -217,6 +218,61 @@
 		printf ("SKIP: __nih_abort_msg not available\n");
 	}
 
+=======
+	TEST_FEATURE ("with fatal message");
+	TEST_ALLOC_FAIL {
+		__nih_abort_msg = NULL;
+		last_priority = NIH_LOG_UNKNOWN;
+		last_message = NULL;
+
+		ret = nih_log_message (NIH_LOG_FATAL,
+				"message with %s %d formatting",
+				"some", 20);
+
+		TEST_EQ (ret, 0);
+		TEST_EQ (last_priority, NIH_LOG_FATAL);
+		TEST_EQ_STR (last_message, "message with some 20 formatting");
+
+		TEST_NE_P (__nih_abort_msg, NULL);
+		TEST_ALLOC_PARENT (__nih_abort_msg, NULL);
+		TEST_EQ_STR (__nih_abort_msg, "message with some 20 formatting");
+
+		free (last_message);
+	}
+
+
+	/* Check that a fatal message can safely overwrite one already stored
+	 * in the __nih_abort_msg variable.
+	 */
+	TEST_FEATURE ("with second fatal message");
+	TEST_ALLOC_FAIL {
+		TEST_ALLOC_SAFE {
+			msg = nih_strdup (NULL, "test");
+		}
+
+		__nih_abort_msg = msg;
+		TEST_FREE_TAG (msg);
+
+		last_priority = NIH_LOG_UNKNOWN;
+		last_message = NULL;
+
+		ret = nih_log_message (NIH_LOG_FATAL,
+				"message with %s %d formatting",
+				"some", 20);
+
+		TEST_EQ (ret, 0);
+		TEST_EQ (last_priority, NIH_LOG_FATAL);
+		TEST_EQ_STR (last_message, "message with some 20 formatting");
+
+		TEST_FREE (msg);
+
+		TEST_NE_P (__nih_abort_msg, NULL);
+		TEST_ALLOC_PARENT (__nih_abort_msg, NULL);
+		TEST_EQ_STR (__nih_abort_msg, "message with some 20 formatting");
+
+		free (last_message);
+	}
+>>>>>>> MERGE-SOURCE
 
 	/* Check that the nih_debug macro wraps the call properly and
 	 * includes the function in which the message occurred.

=== modified file 'nih/tests/test_main.c'
--- nih/tests/test_main.c	2010-02-04 22:30:23 +0000
+++ nih/tests/test_main.c	2012-10-28 15:15:26 +0000
@@ -457,7 +457,7 @@
 test_main_loop (void)
 {
 	NihMainLoopFunc *func;
-	NihTimer        *timer;
+	NihTimer        *timer  __attribute__((__unused__));
 	int              ret;
 
 	/* Check that we can run through the main loop, and that the

=== modified file 'nih/tests/test_option.c'
--- nih/tests/test_option.c	2010-02-04 22:30:23 +0000
+++ nih/tests/test_option.c	2012-10-28 15:15:26 +0000
@@ -1574,7 +1574,7 @@
 		output = tmpfile ();
 		TEST_CHILD (pid) {
 			TEST_DIVERT_STDOUT (output) {
-				char **args;
+				char **args  __attribute__((__unused__));
 
 				args = nih_option_parser (NULL, argc, argv,
 							  options, FALSE);
@@ -1652,7 +1652,7 @@
 			unsetenv ("COLUMNS");
 
 			TEST_DIVERT_STDOUT (output) {
-				char **args;
+				char **args  __attribute__((__unused__));
 
 				args = nih_option_parser (NULL, argc, argv,
 							  options, FALSE);