[gentoo-commits] gentoo-projects commit in portage-utils/libq: atom_explode.c

[Mike Frysinger (vapier)]

vapier      11/01/18 03:12:19

  Modified:             atom_explode.c
  Log:
  handle PN with trailing numbers and/or single letter suffix #222021

Revision  Changes    Path
1.26                 portage-utils/libq/atom_explode.c

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

Index: atom_explode.c
===================================================================
RCS file: /var/cvsroot/gentoo-projects/portage-utils/libq/atom_explode.c,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- atom_explode.c	2 Feb 2008 08:53:53 -0000	1.25
+++ atom_explode.c	18 Jan 2011 03:12:19 -0000	1.26
@@ -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/libq/atom_explode.c,v 1.25 2008/02/02 08:53:53 solar Exp $
+ * $Header: /var/cvsroot/gentoo-projects/portage-utils/libq/atom_explode.c,v 1.26 2011/01/18 03:12:19 vapier Exp $
  *
  * Copyright 2005-2008 Ned Ludd        - <solar@g.o>
  * Copyright 2005-2008 Mike Frysinger  - <vapier@g.o>
@@ -150,13 +150,11 @@
 	bool has_pv = false;
 	while (--ptr > ret->PN)
 		if (*ptr == '-') {
-			if (has_pv)
-				*ptr = '\0';
+			has_pv = true;
+			*ptr = '\0';
 			break;
 		} else if (*ptr != '.' && !isdigit(*ptr))
 			break;
-		else
-			has_pv = true;
 	if (has_pv) {
 		ret->PV = ret->P + (ptr - ret->PN) + 1;
 	} else {