From owner-svn-soc-all@FreeBSD.ORG  Thu Jul 11 04:01:45 2013
Return-Path: <owner-svn-soc-all@FreeBSD.ORG>
Delivered-To: svn-soc-all@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 by hub.freebsd.org (Postfix) with ESMTP id 47991E27
 for <svn-soc-all@FreeBSD.org>; Thu, 11 Jul 2013 04:01:45 +0000 (UTC)
 (envelope-from mattbw@FreeBSD.org)
Received: from socsvn.freebsd.org (socsvn.freebsd.org
 [IPv6:2001:1900:2254:206a::50:2])
 by mx1.freebsd.org (Postfix) with ESMTP id 39EC41EA5
 for <svn-soc-all@FreeBSD.org>; Thu, 11 Jul 2013 04:01:45 +0000 (UTC)
Received: from socsvn.freebsd.org ([127.0.1.124])
 by socsvn.freebsd.org (8.14.7/8.14.7) with ESMTP id r6B41iMZ069706
 for <svn-soc-all@FreeBSD.org>; Thu, 11 Jul 2013 04:01:44 GMT
 (envelope-from mattbw@FreeBSD.org)
Received: (from www@localhost)
 by socsvn.freebsd.org (8.14.7/8.14.6/Submit) id r6B41iB1069695
 for svn-soc-all@FreeBSD.org; Thu, 11 Jul 2013 04:01:44 GMT
 (envelope-from mattbw@FreeBSD.org)
Date: Thu, 11 Jul 2013 04:01:44 GMT
Message-Id: <201307110401.r6B41iB1069695@socsvn.freebsd.org>
X-Authentication-Warning: socsvn.freebsd.org: www set sender to
 mattbw@FreeBSD.org using -f
From: mattbw@FreeBSD.org
To: svn-soc-all@FreeBSD.org
Subject: socsvn commit: r254597 - soc2013/mattbw/backend
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-soc-all@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the entire Summer of Code repository
 <svn-soc-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-soc-all>,
 <mailto:svn-soc-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-soc-all>
List-Post: <mailto:svn-soc-all@freebsd.org>
List-Help: <mailto:svn-soc-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-soc-all>,
 <mailto:svn-soc-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 11 Jul 2013 04:01:45 -0000

Author: mattbw
Date: Thu Jul 11 04:01:44 2013
New Revision: 254597
URL: http://svnweb.FreeBSD.org/socsvn/?view=rev&rev=254597

Log:
  also use origin mapping if categories exist but could not be mapped

Modified:
  soc2013/mattbw/backend/group.c

Modified: soc2013/mattbw/backend/group.c
==============================================================================
--- soc2013/mattbw/backend/group.c	Thu Jul 11 03:57:53 2013	(r254596)
+++ soc2013/mattbw/backend/group.c	Thu Jul 11 04:01:44 2013	(r254597)
@@ -99,10 +99,12 @@
 		assert(category != NULL);
 
 		group = group_from_port_dir(pkg_category_name(category));
-	} else {
+	}
+
+	/* Fallback to checking the origin if category mapping failed. */
+	if (group == PK_GROUP_ENUM_UNKNOWN) {
 		const char *origin;
 	
-		/* Fallback to checking the origin. */
 		origin = NULL;
 		if (pkg_get(pkg, PKG_ORIGIN, &origin) == EPKG_OK) {
 			assert(origin != NULL);