Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
N
nexpie-grafana-theme
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Registry
Registry
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Kornkitt Poolsup
nexpie-grafana-theme
Commits
645293e5
Commit
645293e5
authored
Aug 30, 2016
by
bergquist
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix(cli): improve error message for upgrade-all
closes #5885
parent
b55b7cde
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
11 additions
and
3 deletions
+11
-3
pkg/cmd/grafana-cli/commands/commands.go
+1
-1
pkg/cmd/grafana-cli/commands/upgrade_all_command.go
+10
-2
No files found.
pkg/cmd/grafana-cli/commands/commands.go
View file @
645293e5
...
@@ -14,7 +14,7 @@ func runCommand(command func(commandLine CommandLine) error) func(context *cli.C
...
@@ -14,7 +14,7 @@ func runCommand(command func(commandLine CommandLine) error) func(context *cli.C
cmd
:=
&
contextCommandLine
{
context
}
cmd
:=
&
contextCommandLine
{
context
}
if
err
:=
command
(
cmd
);
err
!=
nil
{
if
err
:=
command
(
cmd
);
err
!=
nil
{
logger
.
Errorf
(
"
\n
%s: "
,
color
.
RedString
(
"Error"
))
logger
.
Errorf
(
"
\n
%s: "
,
color
.
RedString
(
"Error"
))
logger
.
Errorf
(
"%s
\n\n
"
,
err
)
logger
.
Errorf
(
"%s
%s
\n\n
"
,
color
.
RedString
(
"✗"
)
,
err
)
cmd
.
ShowHelp
()
cmd
.
ShowHelp
()
os
.
Exit
(
1
)
os
.
Exit
(
1
)
...
...
pkg/cmd/grafana-cli/commands/upgrade_all_command.go
View file @
645293e5
...
@@ -53,8 +53,16 @@ func upgradeAllCommand(c CommandLine) error {
...
@@ -53,8 +53,16 @@ func upgradeAllCommand(c CommandLine) error {
for
_
,
p
:=
range
pluginsToUpgrade
{
for
_
,
p
:=
range
pluginsToUpgrade
{
logger
.
Infof
(
"Updating %v
\n
"
,
p
.
Id
)
logger
.
Infof
(
"Updating %v
\n
"
,
p
.
Id
)
s
.
RemoveInstalledPlugin
(
pluginsDir
,
p
.
Id
)
var
err
error
InstallPlugin
(
p
.
Id
,
""
,
c
)
err
=
s
.
RemoveInstalledPlugin
(
pluginsDir
,
p
.
Id
)
if
err
!=
nil
{
return
err
}
err
=
InstallPlugin
(
p
.
Id
,
""
,
c
)
if
err
!=
nil
{
return
err
}
}
}
return
nil
return
nil
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment