From owner-svn-soc-all@FreeBSD.ORG  Fri Sep  6 20:46:52 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])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTP id 8125634B
 for <svn-soc-all@FreeBSD.org>; Fri,  6 Sep 2013 20:46:52 +0000 (UTC)
 (envelope-from mattbw@FreeBSD.org)
Received: from socsvn.freebsd.org (socsvn.freebsd.org
 [IPv6:2001:1900:2254:206a::50:2])
 (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id 54F482354
 for <svn-soc-all@FreeBSD.org>; Fri,  6 Sep 2013 20:46:52 +0000 (UTC)
Received: from socsvn.freebsd.org ([127.0.1.124])
 by socsvn.freebsd.org (8.14.7/8.14.7) with ESMTP id r86KkqHc018118
 for <svn-soc-all@FreeBSD.org>; Fri, 6 Sep 2013 20:46:52 GMT
 (envelope-from mattbw@FreeBSD.org)
Received: (from www@localhost)
 by socsvn.freebsd.org (8.14.7/8.14.6/Submit) id r86Kkqgf018114
 for svn-soc-all@FreeBSD.org; Fri, 6 Sep 2013 20:46:52 GMT
 (envelope-from mattbw@FreeBSD.org)
Date: Fri, 6 Sep 2013 20:46:52 GMT
Message-Id: <201309062046.r86Kkqgf018114@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: r257032 - in soc2013/mattbw/backend: . jobs
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: Fri, 06 Sep 2013 20:46:52 -0000

Author: mattbw
Date: Fri Sep  6 20:46:51 2013
New Revision: 257032
URL: http://svnweb.FreeBSD.org/socsvn/?view=rev&rev=257032

Log:
  Move jobs.c to jobs/core.c.
  
  This brings it in line with query.
  

Added:
  soc2013/mattbw/backend/jobs/core.c
     - copied, changed from r257007, soc2013/mattbw/backend/jobs.c
Deleted:
  soc2013/mattbw/backend/jobs.c
Modified:
  soc2013/mattbw/backend/Makefile
  soc2013/mattbw/backend/jobs/do.h

Modified: soc2013/mattbw/backend/Makefile
==============================================================================
--- soc2013/mattbw/backend/Makefile	Fri Sep  6 18:41:57 2013	(r257031)
+++ soc2013/mattbw/backend/Makefile	Fri Sep  6 20:46:51 2013	(r257032)
@@ -28,7 +28,6 @@
 		event.c				\
 		group.c				\
 		group_map.c			\
-		jobs.c				\
 		licenses.c			\
 		namever.c			\
 		pkgutils.c			\
@@ -63,6 +62,7 @@
 		query/packages.c
 
 SRCS+=						\
+		jobs/core.c			\
 		jobs/check.c			\
 		jobs/do.c
 

Copied and modified: soc2013/mattbw/backend/jobs/core.c (from r257007, soc2013/mattbw/backend/jobs.c)
==============================================================================
--- soc2013/mattbw/backend/jobs.c	Fri Sep  6 12:08:31 2013	(r257007, copy source)
+++ soc2013/mattbw/backend/jobs/core.c	Fri Sep  6 20:46:51 2013	(r257032)
@@ -24,18 +24,18 @@
 #include <glib.h>		/* gchar, g_... */
 #include <stdbool.h>		/* bool, true, false */
 #include <string.h>		/* strcmp */
-#include "pk-backend.h"		/* pk_..., Pk... */
+#include "../pk-backend.h"	/* pk_..., Pk... */
 #include "pkg.h"		/* pkg_... */
 
-#include "db.h"			/* db_... */
-#include "emit.h"		/* emit_package */
-#include "event.h"		/* event_cb */
-#include "jobs.h"		/* jobs_... */
-#include "jobs/check.h"		/* jobs_check_... */
-#include "namever.h"		/* namever_* */
-#include "pkgutils.h"		/* pkgutils_... */
-#include "repo.h"		/* repo_... */
-#include "utils.h"		/* ERR */
+#include "../db.h"		/* db_... */
+#include "../emit.h"		/* emit_package */
+#include "../event.h"		/* event_cb */
+#include "../namever.h"		/* namever_* */
+#include "../pkgutils.h"	/* pkgutils_... */
+#include "../repo.h"		/* repo_... */
+#include "../utils.h"		/* ERR */
+#include "check.h"		/* jobs_check_... */
+#include "core.h"		/* jobs_... */
 
 static const char *APPLY_ERRORS[] = {
 	"This shouldn't occur and is a bug.",	/* EPKG_OK */

Modified: soc2013/mattbw/backend/jobs/do.h
==============================================================================
--- soc2013/mattbw/backend/jobs/do.h	Fri Sep  6 18:41:57 2013	(r257031)
+++ soc2013/mattbw/backend/jobs/do.h	Fri Sep  6 20:46:51 2013	(r257032)
@@ -23,6 +23,7 @@
 
 #include <stdbool.h>		/* bool */
 #include "../pk-backend.h"	/* PkBackend */
+
 #include "core.h"		/* pkg_info_ptr */
 
 struct jobs_spec {