fix parsing of disttag from synthesis

2 files changed, 10 insertions, 20 deletions

diff --git a/NEWS b/NEWS
index 924c886..a2f9d38 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,8 @@
+Version 4.13 - 23 Jan 2011, by Per Øyvind Karlsen
+
+- fix parsing of disttag from synthesis
+- add regression checks for the fields extracted from synthesis
+
 Version 4.12 - 23 Jan 2011, by Per Øyvind Karlsen
 
 - order of %PROVIDEVERSION isn't always the same for all rpm versions synthesis
diff --git a/URPM.xs b/URPM.xs
index 3a87337..1ff2a97 100644
--- a/URPM.xs
+++ b/URPM.xs
@@ -317,34 +317,19 @@ get_fullname_parts_info(URPM__Package pkg, char **name, int *epoch, char **versi
 	  backup_char(_arch++);
 	if (arch != NULL) *arch = pubkey ? "" : _arch;
 	if (distepoch != NULL || disttag != NULL || release != NULL || version != NULL || name != NULL) {
+	  /* TODO: implement stricter patterns and different separator for disttag/distepoch */
 	  if ((_distepoch = strchr(strrchr(pkg->provides, '-'), ':')) != NULL) {
 	    if ((tmp = strrchr(++_distepoch, ']'))) {
 	      backup_char(tmp);
-	      if ((tmp = strrchr(pkg->info, '-')) && ((tmp2 = strstr(tmp, _distepoch))))
-		backup_char(tmp);
-	      else {
-		/* If synthesis is generated with older versions, disttag & distepoch will
-		 * not be part of NVRA at beginning of line, but as it'll still be part of
-		 * filename which is located at end of line, we can live with it as long
-		 * as we're aware of it and take the necessary precautions to cope.
-		 */
-		if ((tmp = strrchr(_eos, '-'))) {
-		  if ((tmp2 = strstr(tmp++, _distepoch))) {
-		    backup_char(tmp2);
-		    _disttag = tmp;
-		  }
-		}
+	      if (((tmp = strrchr(_eos, '-')) || (tmp = strrchr(pkg->info, '-'))) && ((tmp2 = strstr(tmp, _distepoch)))) {
+		backup_char(tmp++);
+		_disttag = tmp;
+		backup_char(tmp2);
 	      }
 	    }
 	  }
 	  if (distepoch != NULL) *distepoch = _distepoch ? _distepoch : "";
 	  if (disttag != NULL || release != NULL || version != NULL || name != NULL) {
-	    if (_disttag == NULL) {
-	      /* XXX: re-verify this logic, see comment above.. */
-	      if ((_disttag = tmp2) != NULL && (strstr(pkg->provides, _disttag)) == NULL) {
-		backup_char(_disttag++);
-	      } else _disttag = NULL;
-	    }
 	    if (disttag != NULL) *disttag = _disttag ? _disttag : "";
 	    if ((release != NULL || version != NULL || name != NULL) && (_release = strrchr(pkg->info, '-')) != NULL) {
 	      backup_char(_release++);