busybox/patches/912-ipkg-nodiff.patch

$FreeWRT$

        Only offer a choice to use diff if it's installed.

        Note: we're not entirely exact here. If someone installs a different
        “diff” package, e.g. GNU diff or 4.4BSD diff, this won't trigger, but
        that's not going to happen any time soon, I suppose. --tg@

--- busybox/archival/libipkg/ipkg_install.c.orig        2007-03-13 20:24:28.000000000 +0000
+++ busybox/archival/libipkg/ipkg_install.c     2007-03-13 20:26:11.000000000 +0000
@@ -1560,9 +1560,15 @@ static int user_prefers_old_conffile(con
                                       "       What would you like to do about it ?  Your options are:\n"
                                       "        Y or I  : install the package maintainer's version\n"
                                       "        N or O  : keep your currently-installed version\n"
-                                      "          D     : show the differences between the versions (if diff is installed)\n"
+#ifdef CONFIG_DIFF
+                                      "          D     : show the differences between the versions\n"
+#endif
                                       "     The default action is to keep your current version.\n"
-                                      "    *** %s (Y/I/N/O/D) [default=N] ? ", file_name, short_file_name);
+                                      "    *** %s (Y/I/N/O"
+#ifdef CONFIG_DIFF
+                                                          "/D"
+#endif
+                                                             ") [default=N] ? ", file_name, short_file_name);
          if (strcmp(response, "y") == 0
              || strcmp(response, "i") == 0
              || strcmp(response, "yes") == 0) {
@@ -1570,6 +1576,7 @@ static int user_prefers_old_conffile(con
               return 0;
          }
 
+#ifdef CONFIG_DIFF
          if (strcmp(response, "d") == 0) {
               char *cmd;
 
@@ -1583,6 +1590,7 @@ static int user_prefers_old_conffile(con
               free(response);
               continue;
          }
+#endif
 
          free(response);
          return 1;
// Log In
// CVSweb
Project: FreeWRT
// Summary // Activity // Search // Tracker // Lists // News // SCM // Wiki
1	$FreeWRT$
2
3	Only offer a choice to use diff if it's installed.
4
5	Note: we're not entirely exact here. If someone installs a different
6	“diff” package, e.g. GNU diff or 4.4BSD diff, this won't trigger, but
7	that's not going to happen any time soon, I suppose. --tg@
8
9	--- busybox/archival/libipkg/ipkg_install.c.orig 2007-03-13 20:24:28.000000000 +0000
10	+++ busybox/archival/libipkg/ipkg_install.c 2007-03-13 20:26:11.000000000 +0000
11	@@ -1560,9 +1560,15 @@ static int user_prefers_old_conffile(con
12	" What would you like to do about it ? Your options are:\n"
13	" Y or I : install the package maintainer's version\n"
14	" N or O : keep your currently-installed version\n"
15	- " D : show the differences between the versions (if diff is installed)\n"
16	+#ifdef CONFIG_DIFF
17	+ " D : show the differences between the versions\n"
18	+#endif
19	" The default action is to keep your current version.\n"
20	- " *** %s (Y/I/N/O/D) [default=N] ? ", file_name, short_file_name);
21	+ " *** %s (Y/I/N/O"
22	+#ifdef CONFIG_DIFF
23	+ "/D"
24	+#endif
25	+ ") [default=N] ? ", file_name, short_file_name);
26	if (strcmp(response, "y") == 0
27	\|\| strcmp(response, "i") == 0
28	\|\| strcmp(response, "yes") == 0) {
29	@@ -1570,6 +1576,7 @@ static int user_prefers_old_conffile(con
30	return 0;
31	}
32
33	+#ifdef CONFIG_DIFF
34	if (strcmp(response, "d") == 0) {
35	char *cmd;
36
37	@@ -1583,6 +1590,7 @@ static int user_prefers_old_conffile(con
38	free(response);
39	continue;
40	}
41	+#endif
42
43	free(response);
44	return 1;