From dc01bbb222eea1c7870d53c362d00dadbcf72784 Mon Sep 17 00:00:00 2001
From: obarun <eric@obarun.org>
Date: Tue, 5 Feb 2019 19:56:02 +1100
Subject: [PATCH] remove -u at s6-rc-compile
---
src/lib66/db_compile.c | 16 +++-------------
1 file changed, 3 insertions(+), 13 deletions(-)
diff --git a/src/lib66/db_compile.c b/src/lib66/db_compile.c
index f722d704..f96086a8 100644
--- a/src/lib66/db_compile.c
+++ b/src/lib66/db_compile.c
@@ -39,8 +39,7 @@ int db_compile(char const *workdir, char const *tree, char const *treename, char
stralloc source = STRALLOC_ZERO ;
stralloc destination = STRALLOC_ZERO ;
- stralloc uid = STRALLOC_ZERO ;
-
+
if (!stralloc_cats(&destination,workdir)) retstralloc(0,"compile_db") ;
if (!stralloc_cats(&destination,SS_DB)) retstralloc(0,"compile_db") ;
if (!stralloc_0(&destination)) retstralloc(0,"compile_db") ;
@@ -60,14 +59,8 @@ int db_compile(char const *workdir, char const *tree, char const *treename, char
if (!stralloc_cats(&source,workdir)) retstralloc(0,"compile_db") ;
if (!stralloc_cats(&source,SS_DB SS_SRC)) retstralloc(0,"compile_db") ;
if (!stralloc_0(&source)) retstralloc(0,"compile_db") ;
-
- if (!db_get_permissions(&uid,tree))
- {
- VERBO3 strerr_warnwu1sys("get database permissions") ;
- return 0 ;
- }
-
- char const *newargv[9] ;
+
+ char const *newargv[7] ;
unsigned int m = 0 ;
char fmt[UINT_FMT] ;
fmt[uint_fmt(fmt, VERBOSITY)] = 0 ;
@@ -75,8 +68,6 @@ int db_compile(char const *workdir, char const *tree, char const *treename, char
newargv[m++] = S6RC_BINPREFIX "s6-rc-compile" ;
newargv[m++] = "-v" ;
newargv[m++] = fmt ;
- newargv[m++] = "-u" ;
- newargv[m++] = uid.s ;
newargv[m++] = "--" ;
newargv[m++] = destination.s ;
newargv[m++] = source.s ;
@@ -96,7 +87,6 @@ int db_compile(char const *workdir, char const *tree, char const *treename, char
stralloc_free(&source) ;
stralloc_free(&destination) ;
- stralloc_free(&uid) ;
return 1 ;
}
--
GitLab