Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
10
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Open sidebar
Applications
mhwd
Commits
8e5b886f
Commit
8e5b886f
authored
Jul 15, 2020
by
TotallyNotElite
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Dependency fixes
parent
0376ee15
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
5 additions
and
6 deletions
+5
-6
src/Data.cpp
src/Data.cpp
+3
-0
src/Mhwd.cpp
src/Mhwd.cpp
+2
-6
No files found.
src/Data.cpp
View file @
8e5b886f
...
...
@@ -294,6 +294,9 @@ std::vector<std::shared_ptr<Config>> Data::getAllLocalConflicts(std::shared_ptr<
// Then loop thru all already installed configs. If there are no configs installed, there can not be a conflict
for
(
auto
&
installedConfig
:
installedConfigs
)
{
// Skip yourself
if
(
installedConfig
->
name_
==
config
->
name_
)
continue
;
// Does one of the installed configs conflict one of the to-be-installed configs?
if
(
!
fnmatch
(
dependencyConflict
.
c_str
(),
installedConfig
->
name_
.
c_str
(),
FNM_CASEFOLD
))
{
...
...
src/Mhwd.cpp
View file @
8e5b886f
...
...
@@ -62,12 +62,8 @@ bool Mhwd::performTransaction(std::shared_ptr<Config> config, MHWD::TRANSACTIONT
// Print dependencies
else
if
(
!
transaction
.
dependencyConfigs_
.
empty
())
{
consoleWriter_
.
printStatus
(
"Dependencies to install:"
+
gatherConfigContent
(
transaction
.
dependencyConfigs_
)
+
"
\n
Proceed with installation? [Y/n]"
);
std
::
string
input
;
std
::
getline
(
std
::
cin
,
input
);
return
proceedWithInstallation
(
input
);
consoleWriter_
.
printStatus
(
"Dependencies to install: "
+
gatherConfigContent
(
transaction
.
dependencyConfigs_
));
}
}
else
if
(
MHWD
::
TRANSACTIONTYPE
::
REMOVE
==
transactionType
)
...
...
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