Date: Wed, 30 Oct 2013 16:51:31 GMT From: Veniamin Gvozdikov <vg@FreeBSD.org> To: freebsd-gnats-submit@FreeBSD.org Subject: misc/183492: [fix]: sysutils/py-salt Fixed work with custom path to pkgng db Message-ID: <201310301651.r9UGpVwV091385@oldred.freebsd.org> Resent-Message-ID: <201310301700.r9UH01Xv048746@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 183492
>Category: misc
>Synopsis: [fix]: sysutils/py-salt Fixed work with custom path to pkgng db
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: update
>Submitter-Id: current-users
>Arrival-Date: Wed Oct 30 17:00:01 UTC 2013
>Closed-Date:
>Last-Modified:
>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
@@ -3,6 +3,7 @@
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:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201310301651.r9UGpVwV091385>