Skip site navigation (1)Skip section navigation (2)
Date:      Thu, 31 Oct 2013 20:48:47 +0000 (UTC)
From:      Veniamin Gvozdikov <vg@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r332285 - in head/sysutils/py-salt: . files
Message-ID:  <201310312048.r9VKmmgj052977@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
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



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201310312048.r9VKmmgj052977>