[gentoo-commits] gentoo-projects commit in portage-utils: main.c qmerge.c

[Mike Frysinger (vapier)]

vapier      11/02/21 06:20:24

  Modified:             main.c qmerge.c
  Log:
  have unmerges prompt with a summary first

Revision  Changes    Path
1.181                portage-utils/main.c

file : http://sources.gentoo.org/viewvc.cgi/gentoo-projects/portage-utils/main.c?rev=1.181&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-projects/portage-utils/main.c?rev=1.181&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-projects/portage-utils/main.c?r1=1.180&r2=1.181

Index: main.c
===================================================================
RCS file: /var/cvsroot/gentoo-projects/portage-utils/main.c,v
retrieving revision 1.180
retrieving revision 1.181
diff -u -r1.180 -r1.181
--- main.c	21 Feb 2011 01:33:47 -0000	1.180
+++ main.c	21 Feb 2011 06:20:24 -0000	1.181
@@ -1,7 +1,7 @@
 /*
  * Copyright 2005-2008 Gentoo Foundation
  * Distributed under the terms of the GNU General Public License v2
- * $Header: /var/cvsroot/gentoo-projects/portage-utils/main.c,v 1.180 2011/02/21 01:33:47 vapier Exp $
+ * $Header: /var/cvsroot/gentoo-projects/portage-utils/main.c,v 1.181 2011/02/21 06:20:24 vapier Exp $
  *
  * Copyright 2005-2008 Ned Ludd        - <solar@g.o>
  * Copyright 2005-2008 Mike Frysinger  - <vapier@g.o>
@@ -203,6 +203,20 @@
 	return ret;
 }
 
+static bool prompt(const char *p)
+{
+	printf("%s? [Y/n] ", p);
+	fflush(stdout);
+	switch (getc(stdin)) {
+	case '\n':
+	case 'y':
+	case 'Y':
+		return true;
+	default:
+		return false;
+	}
+}
+
 /* if all chars in str1 coincide with the begining of the str2 return 0 */
 int charmatch(const char *str1, const char *str2)
 {



1.99                 portage-utils/qmerge.c

file : http://sources.gentoo.org/viewvc.cgi/gentoo-projects/portage-utils/qmerge.c?rev=1.99&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-projects/portage-utils/qmerge.c?rev=1.99&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-projects/portage-utils/qmerge.c?r1=1.98&r2=1.99

Index: qmerge.c
===================================================================
RCS file: /var/cvsroot/gentoo-projects/portage-utils/qmerge.c,v
retrieving revision 1.98
retrieving revision 1.99
diff -u -r1.98 -r1.99
--- qmerge.c	21 Feb 2011 01:52:46 -0000	1.98
+++ qmerge.c	21 Feb 2011 06:20:24 -0000	1.99
@@ -1,7 +1,7 @@
 /*
  * Copyright 2005-2010 Gentoo Foundation
  * Distributed under the terms of the GNU General Public License v2
- * $Header: /var/cvsroot/gentoo-projects/portage-utils/qmerge.c,v 1.98 2011/02/21 01:52:46 vapier Exp $
+ * $Header: /var/cvsroot/gentoo-projects/portage-utils/qmerge.c,v 1.99 2011/02/21 06:20:24 vapier Exp $
  *
  * Copyright 2005-2010 Ned Ludd        - <solar@g.o>
  * Copyright 2005-2010 Mike Frysinger  - <vapier@g.o>
@@ -55,7 +55,7 @@
 	COMMON_OPTS_HELP
 };
 
-static const char qmerge_rcsid[] = "$Id: qmerge.c,v 1.98 2011/02/21 01:52:46 vapier Exp $";
+static const char qmerge_rcsid[] = "$Id: qmerge.c,v 1.99 2011/02/21 06:20:24 vapier Exp $";
 #define qmerge_usage(ret) usage(ret, QMERGE_FLAGS, qmerge_long_opts, qmerge_opts_help, lookup_applet_idx("qmerge"))
 
 char search_pkgs = 0;
@@ -834,7 +834,10 @@
 		/* qfprintf(stderr, "%s!!!%s %s %s (ambiguous name) specify fully-qualified pkgs\n", RED, NORM, pkgname); */
 		return 1;
 	}
-	printf("%s===%s %s%s%s/%s%s%s\n", YELLOW, NORM, WHITE, cat, NORM, CYAN, pkgname, NORM);
+	printf("%s<<<%s %s%s%s/%s%s%s\n", YELLOW, NORM, WHITE, cat, NORM, CYAN, pkgname, NORM);
+
+	if (pretend == 100)
+		return 0;
 
 	snprintf(buf, sizeof(buf), "%s/%s/%s/%s/CONTENTS", portroot, portvdb, cat, pkgname);
 
@@ -1547,7 +1550,7 @@
 
 int qmerge_main(int argc, char **argv)
 {
-	int i;
+	int i, ret;
 	const char Packages[] = "Packages";
 	int ARGC = argc;
 	char **ARGV = argv;
@@ -1582,8 +1585,30 @@
 			warn("Using these options are likely to break your system at this point. export QMERGE=1; if you think you know what your doing.");
 		}
 	}
-	if (uninstall)
+
+	if (uninstall) {
+		if (interactive) {
+			int save_pretend = pretend;
+			int save_verbose = verbose;
+			int save_quiet = quiet;
+
+			pretend = 100;
+			verbose = 0;
+			quiet = 1;
+			ret = unmerge_packages(argc, argv);
+			if (ret || save_pretend)
+				return ret;
+
+			if (!prompt("OK to unmerge these packages"))
+				return 0;
+
+			pretend = save_pretend;
+			verbose = save_verbose;
+			quiet = save_quiet;
+		}
+
 		return unmerge_packages(argc, argv);
+	}
 
 	ARGC = argc;
 	ARGV = argv;