ccollins476ad closed pull request #135: newt - Fix error message for priority
conflict.
URL: https://github.com/apache/mynewt-newt/pull/135
This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:
As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):
diff --git a/newt/syscfg/syscfg.go b/newt/syscfg/syscfg.go
index 2bd481bf..722d8f49 100644
--- a/newt/syscfg/syscfg.go
+++ b/newt/syscfg/syscfg.go
@@ -802,9 +802,9 @@ func calcPriorities(cfg Cfg, settingType CfgSettingType,
max int,
return util.FmtNewtError(
"duplicate priority
value: setting1=%s "+
"setting2=%s
pkg1=%s pkg2=%s value=%s",
- oldEntry.Name,
entry.Name, entry.Value,
+ oldEntry.Name,
entry.Name,
oldEntry.History[0].Name(),
- entry.History[0].Name())
+
entry.History[0].Name(), entry.Value)
}
}
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
With regards,
Apache Git Services
