Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
6
66
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Eric Vidal
66
Commits
1b1fea9a
Commit
1b1fea9a
authored
1 year ago
by
Eric Vidal
Browse files
Options
Downloads
Patches
Plain Diff
Fix dumb things
parent
13769889
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
src/lib66/exec/ssexec_env.c
+7
-8
7 additions, 8 deletions
src/lib66/exec/ssexec_env.c
with
7 additions
and
8 deletions
src/lib66/exec/ssexec_env.c
+
7
−
8
View file @
1b1fea9a
...
...
@@ -106,11 +106,9 @@ static void do_import(char const *svname, char const *svconf, char const *versio
unsigned
int
n
=
sastr_len
(
&
sasrc
)
;
checkopts
(
n
)
;
FOREACH_SASTR
(
&
sasrc
,
pos
)
{
if
(
!
pos
)
src_version
=
sasrc
.
s
+
pos
;
else
dst_version
=
sasrc
.
s
+
pos
;
}
src_version
=
sasrc
.
s
;
pos
=
strlen
(
sasrc
.
s
)
+
1
;
dst_version
=
sasrc
.
s
+
pos
;
if
(
!
env_import_version_file
(
svname
,
svconf
,
src_version
,
dst_version
,
svtype
))
log_dieu
(
LOG_EXIT_SYS
,
"import configuration file from version: "
,
src_version
,
" to version: "
,
dst_version
)
;
...
...
@@ -194,7 +192,9 @@ static void write_user_env_file(char const *src, char const *sv)
if
(
r
==
-
1
)
log_die
(
LOG_EXIT_SYS
,
"invalid upstream configuration file! Do you have modified it? Tries to parse the service again."
)
;
write_environ
(
sv
,
sa
.
s
+
r
,
src
)
;
r
++
;
// remove the last \n
if
(
!
write_environ
(
sv
,
sa
.
s
+
r
,
src
))
log_dieu
(
LOG_EXIT_SYS
,
"write environment"
)
;
}
else
log_diesys
(
LOG_EXIT_SYS
,
"conflicting format of file: "
,
tsrc
)
;
...
...
@@ -302,8 +302,7 @@ int ssexec_env(int argc, char const *const *argv, ssexec_t *info)
if
(
r
==
-
1
)
log_dieusys
(
LOG_EXIT_SYS
,
"get information of service: "
,
sv
,
" -- please a bug report"
)
;
else
if
(
!
r
||
r
==
STATE_FLAGS_FALSE
)
{
log_warn
(
"service: "
,
sv
,
" is not parsed -- try to parse it first using '66 parse "
,
sv
,
"'"
)
;
goto
freed
;
log_die
(
LOG_EXIT_SYS
,
"service: "
,
sv
,
" is not parsed -- try to parse it first using '66 parse "
,
sv
,
"'"
)
;
}
if
(
resolve_read_g
(
wres
,
info
->
base
.
s
,
sv
)
<=
0
)
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment