From nobody@FreeBSD.org  Wed Oct 30 16:51:32 2013
Return-Path: <nobody@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 3450E811
	for <freebsd-gnats-submit@FreeBSD.org>; Wed, 30 Oct 2013 16:51:32 +0000 (UTC)
	(envelope-from nobody@FreeBSD.org)
Received: from oldred.freebsd.org (oldred.freebsd.org [8.8.178.121])
	(using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits))
	(No client certificate requested)
	by mx1.freebsd.org (Postfix) with ESMTPS id 2215420E6
	for <freebsd-gnats-submit@FreeBSD.org>; Wed, 30 Oct 2013 16:51:32 +0000 (UTC)
Received: from oldred.freebsd.org ([127.0.1.6])
	by oldred.freebsd.org (8.14.5/8.14.7) with ESMTP id r9UGpVTu091388
	for <freebsd-gnats-submit@FreeBSD.org>; Wed, 30 Oct 2013 16:51:31 GMT
	(envelope-from nobody@oldred.freebsd.org)
Received: (from nobody@localhost)
	by oldred.freebsd.org (8.14.5/8.14.5/Submit) id r9UGpVwV091385;
	Wed, 30 Oct 2013 16:51:31 GMT
	(envelope-from nobody)
Message-Id: <201310301651.r9UGpVwV091385@oldred.freebsd.org>
Date: Wed, 30 Oct 2013 16:51:31 GMT
From: Veniamin Gvozdikov <vg@FreeBSD.org>
To: freebsd-gnats-submit@FreeBSD.org
Subject: [PATCH] sysutils/py-salt Fixed work with custom path to pkgng db
X-Send-Pr-Version: www-3.1
X-GNATS-Notify:

>Number:         183492
>Category:       ports
>Synopsis:       [PATCH] sysutils/py-salt Fixed work with custom path to pkgng db
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    vg
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Wed Oct 30 17:00:01 UTC 2013
>Closed-Date:    Thu Oct 31 20:49:07 UTC 2013
>Last-Modified:  Thu Oct 31 20:50:01 UTC 2013
>Originator:     Veniamin Gvozdikov
>Release:        FreeBSD 10.0-BETA1
>Organization:
>Environment:
FreeBSD ololo 10.0-BETA1 FreeBSD 10.0-BETA1 #0 r256420: Sun Oct 13 01:43:07 UTC 2013     root@snap.freebsd.org:/usr/obj/usr/src/sys/GENERIC  amd64
>Description:
I tried to work with custom configuration of pkgng parts cache/db and etc. Saltstack doesn't work with that because checks /var/db/pkg/local.sqlite. I changed /var/db/pkg/local.sqlite to /usr/local/etc/pkg.conf because pkg depended by pkg.conf and location of config usually default at the /usr/local/etc.
>How-To-Repeat:

>Fix:
diff -ruN py-salt.orig/Makefile py-salt/Makefile
--- py-salt.orig/Makefile	2013-10-30 20:42:21.320121787 +0400
+++ py-salt/Makefile	2013-10-30 20:29:29.772170230 +0400
@@ -4,5 +4,6 @@
 PORTNAME=	salt
 PORTVERSION=	0.17.1
+PORTREVISION=	1
 CATEGORIES=	sysutils python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
diff -ruN py-salt.orig/files/patch-salt__modules__reebsdpkg.py py-salt/files/patch-salt__modules__reebsdpkg.py
--- py-salt.orig/files/patch-salt__modules__reebsdpkg.py	1970-01-01 03:00:00.000000000 +0300
+++ py-salt/files/patch-salt__modules__reebsdpkg.py	2013-10-30 20:17:54.164221955 +0400
@@ -0,0 +1,11 @@
+--- salt/modules/freebsdpkg.py.orig	2013-10-30 16:16:31.850225522 +0000
++++ salt/modules/freebsdpkg.py	2013-10-30 16:16:47.868224728 +0000
+@@ -27,7 +27,7 @@
+     '''
+     Looks to see if pkgng is being used by checking if database exists
+     '''
+-    return os.path.isfile('/var/db/pkg/local.sqlite')
++    return os.path.isfile('/usr/local/etc/pkg.conf')
+
+
+ @decorators.memoize

>Release-Note:
>Audit-Trail:
State-Changed-From-To: open->feedback 
State-Changed-By: vg 
State-Changed-When: Wed Oct 30 18:12:18 UTC 2013 
State-Changed-Why:  
Please approve that 

http://www.freebsd.org/cgi/query-pr.cgi?pr=183492 
Responsible-Changed-From-To: freebsd-bugs->vg 
Responsible-Changed-By: vg 
Responsible-Changed-When: Wed Oct 30 18:18:13 UTC 2013 
Responsible-Changed-Why:  
I will take it. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=183492 
State-Changed-From-To: feedback->closed 
State-Changed-By: vg 
State-Changed-When: Thu Oct 31 20:49:06 UTC 2013 
State-Changed-Why:  
Committed, thank you! 

http://www.freebsd.org/cgi/query-pr.cgi?pr=183492 

From: Christer Edwards <christer.edwards@gmail.com>
To: bug-followup@freebsd.org, vg@freebsd.org
Cc:  
Subject: Re: ports/183492: [PATCH] sysutils/py-salt Fixed work with custom
 path to pkgng db
Date: Thu, 31 Oct 2013 14:41:58 -0600

 --047d7bdc957462260b04ea0f7cce
 Content-Type: text/plain; charset=UTF-8
 
 Discussed with vg; approved.
 
 --047d7bdc957462260b04ea0f7cce
 Content-Type: text/html; charset=UTF-8
 
 <div dir="ltr">Discussed with vg; approved.</div>
 
 --047d7bdc957462260b04ea0f7cce--

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/183492: commit references a PR
Date: Thu, 31 Oct 2013 20:48:55 +0000 (UTC)

 Author: vg
 Date: Thu Oct 31 20:48:47 2013
 New Revision: 332285
 URL: http://svnweb.freebsd.org/changeset/ports/332285
 
 Log:
   - Fixed pkgng support with custom path to db
   
   PR:		ports/183492
   Submitted by:	myself
   Approved by:	eadler, osa, rm (mentors, implicit), Christer Edwards <christer.edwards@gmail.com> (maintainer)
 
 Added:
   head/sysutils/py-salt/files/patch-salt__modules__reebsdpkg.py   (contents, props changed)
 Modified:
   head/sysutils/py-salt/Makefile
 
 Modified: head/sysutils/py-salt/Makefile
 ==============================================================================
 --- head/sysutils/py-salt/Makefile	Thu Oct 31 20:13:54 2013	(r332284)
 +++ head/sysutils/py-salt/Makefile	Thu Oct 31 20:48:47 2013	(r332285)
 @@ -3,6 +3,7 @@
  
  PORTNAME=	salt
  PORTVERSION=	0.17.1
 +PORTREVISION=	1
  CATEGORIES=	sysutils python
  MASTER_SITES=	CHEESESHOP
  PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 Added: head/sysutils/py-salt/files/patch-salt__modules__reebsdpkg.py
 ==============================================================================
 --- /dev/null	00:00:00 1970	(empty, because file is newly added)
 +++ head/sysutils/py-salt/files/patch-salt__modules__reebsdpkg.py	Thu Oct 31 20:48:47 2013	(r332285)
 @@ -0,0 +1,11 @@
 +--- salt/modules/freebsdpkg.py.orig	2013-10-30 16:16:31.850225522 +0000
 ++++ salt/modules/freebsdpkg.py	2013-10-30 16:16:47.868224728 +0000
 +@@ -27,7 +27,7 @@
 +     '''
 +     Looks to see if pkgng is being used by checking if database exists
 +     '''
 +-    return os.path.isfile('/var/db/pkg/local.sqlite')
 ++    return os.path.isfile('/usr/local/etc/pkg.conf')
 + 
 + 
 + @decorators.memoize
 _______________________________________________
 svn-ports-all@freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/svn-ports-all
 To unsubscribe, send any mail to "svn-ports-all-unsubscribe@freebsd.org"
 
>Unformatted:
