Bug 183492 - [PATCH] sysutils/py-salt Fixed work with custom path to pkgng db
Summary: [PATCH] sysutils/py-salt Fixed work with custom path to pkgng db
Status: Closed FIXED
Alias: None
Product: Ports & Packages
Classification: Unclassified
Component: Individual Port(s) (show other bugs)
Version: Latest
Hardware: Any Any
: Normal Affects Only Me
Assignee: Veniamin Gvozdikov
URL:
Keywords:
Depends on:
Blocks:
 
Reported: 2013-10-30 17:00 UTC by Veniamin Gvozdikov
Modified: 2013-10-31 20:50 UTC (History)
0 users

See Also:

Attachments
file.diff (1.01 KB, patch)
2013-10-30 17:00 UTC, Veniamin Gvozdikov 		no flags Details | Diff
View All Add an attachment (proposed patch, testcase, etc.)

Note You need to log in before you can comment on or make changes to this bug.
Description Veniamin Gvozdikov freebsd_committer freebsd_triage 2013-10-30 17:00:01 UTC 
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.
Comment 1 Veniamin Gvozdikov freebsd_committer freebsd_triage 2013-10-30 18:12:18 UTC 
State Changed
From-To: open->feedback

Please approve that
Comment 2 Veniamin Gvozdikov freebsd_committer freebsd_triage 2013-10-30 18:18:13 UTC 
Responsible Changed
From-To: freebsd-bugs->vg

I will take it.
Comment 3 Christer Edwards 2013-10-31 20:41:58 UTC 
Discussed with vg; approved.
Comment 4 dfilter service freebsd_committer freebsd_triage 2013-10-31 20:48:55 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"
Comment 5 Veniamin Gvozdikov freebsd_committer freebsd_triage 2013-10-31 20:49:06 UTC 
State Changed
From-To: feedback->closed

Committed, thank you!