Page MenuHomeFreeBSD
Differential D47201

stand: Fix defaults file
ClosedPublic
Actions

Authored by imp on Sat, Oct 19, 6:17 PM.
Tags
None
Referenced Files
Unknown Object (File)
Sat, Nov 2, 5:38 AM
Unknown Object (File)
Fri, Nov 1, 6:45 AM
Unknown Object (File)
Mon, Oct 28, 9:59 PM
Unknown Object (File)
Sun, Oct 20, 11:09 PM
Unknown Object (File)
Sun, Oct 20, 1:26 PM
Unknown Object (File)
Sun, Oct 20, 3:44 AM
Unknown Object (File)
Sat, Oct 19, 6:20 PM
Subscribers
dab
kevans

Details

Reviewers
manu
bcran
Commits
rGef48b2954e24: stand: Fix defaults file
Summary

Currently, quotes in a comment lead to mal-formed lines warnings. Remove
the quotes since it doesn't matter. The underlying bug likely should be
fixed, but since stability week is neigh, workaround this.

Fixes: 7df3e400ea687
Sponsored by: Netflix

Diff Detail

Repository
rG FreeBSD src repository
Lint
Lint Not Applicable
Unit
Tests Not Applicable

Event Timeline

imp created this revision.Sat, Oct 19, 6:17 PM
Herald added a reviewer: manu. · View Herald TranscriptSat, Oct 19, 6:17 PM
Herald added a subscriber: dab. · View Herald Transcript
imp requested review of this revision.Sat, Oct 19, 6:17 PM
Harbormaster completed remote builds in B60098: Diff 145167.Sat, Oct 19, 6:18 PM
bcran accepted this revision.Sat, Oct 19, 6:20 PM
This revision is now accepted and ready to land.Sat, Oct 19, 6:20 PM
Closed by commit rGef48b2954e24: stand: Fix defaults file (authored by imp). · Explain WhySat, Oct 19, 6:53 PM
This revision was automatically updated to reflect the committed changes.
imp added a commit: rGef48b2954e24: stand: Fix defaults file.
kevans added a subscriber: kevans.EditedSat, Oct 19, 7:42 PM

I suspect this is sufficient to fix the underlying problem:

diff --git a/stand/lua/config.lua b/stand/lua/config.lua
index 86f5ef6174a2..bcf418cfca88 100644
--- a/stand/lua/config.lua
+++ b/stand/lua/config.lua
@@ -65,7 +65,7 @@ local MSG_FAILSYN_BADVAR = "Malformed variable expression at position '%d'"
 -- env_var entries in the pattern table.  This is perhaps a good target for a
 -- little refactoring.
 local MODULEEXPR = '([%w%d-_.]+)'
-local QVALEXPR = '"(.*)"'
+local QVALEXPR = '"([^#]*)"'
 local QVALREPL = QVALEXPR:gsub('%%', '%%%%')
 local WORDEXPR = "([-%w%d][-%w%d_.]*)"
 local WORDREPL = WORDEXPR:gsub('%%', '%%%%')
kevans added a comment.EditedSat, Oct 19, 7:43 PM
In D47201#1076170, @kevans wrote:

I suspect this is sufficient to fix the underlying problem:

diff --git a/stand/lua/config.lua b/stand/lua/config.lua
index 86f5ef6174a2..bcf418cfca88 100644
--- a/stand/lua/config.lua
+++ b/stand/lua/config.lua
@@ -65,7 +65,7 @@ local MSG_FAILSYN_BADVAR = "Malformed variable expression at position '%d'"
 -- env_var entries in the pattern table.  This is perhaps a good target for a
 -- little refactoring.
 local MODULEEXPR = '([%w%d-_.]+)'
-local QVALEXPR = '"(.*)"'
+local QVALEXPR = '"([^#]*)"'
 local QVALREPL = QVALEXPR:gsub('%%', '%%%%')
 local WORDEXPR = "([-%w%d][-%w%d_.]*)"
 local WORDREPL = WORDEXPR:gsub('%%', '%%%%')

nope. ignore that.

Revision Contents
Changeset List

PathSize
stand/
defaults/
2 lines

Diff 145171

View Options

stand/defaults/loader.conf

Loading...