Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
E
eepm
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
etersoft
eepm
Commits
5c3f57ed
You need to sign in or sign up before continuing.
Commit
5c3f57ed
authored
3 years ago
by
Vitaly Lipatov
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
epm-remove: fix remove skipping on failed deps
parent
cbac2d11
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
13 additions
and
2 deletions
+13
-2
epm-remove
bin/epm-remove
+5
-2
run_command2.sh
tests/run_command2.sh
+8
-0
No files found.
bin/epm-remove
View file @
5c3f57ed
...
...
@@ -23,9 +23,11 @@ load_helper epm-print
load_helper epm-sh-warmup
load_helper epm-sh-install
RPMISNOTINSTALLED
=
202
__check_rpm_e_result
()
{
grep
-q
"is not installed"
$1
&&
return
2
grep
-q
"is not installed"
$1
&&
return
$RPMISNOTINSTALLED
return
$2
}
...
...
@@ -42,6 +44,7 @@ epm_remove_low()
cd
/tmp
||
fatal
__epm_check_vendor
$@
store_output sudocmd rpm
-ev
$noscripts
$nodeps
$@
# rpm returns number of packages if failed on removing
__check_rpm_e_result
$RC_STDOUT
$?
RES
=
$?
clean_store_output
...
...
@@ -322,7 +325,7 @@ epm_remove()
epm_remove_low
$pkg_names
&&
return
local
STATUS
=
$?
if
[
-n
"
$direct
"
]
||
[
-n
"
$nodeps
"
]
||
[
"
$STATUS
"
=
"
2
"
]
;
then
if
[
-n
"
$direct
"
]
||
[
-n
"
$nodeps
"
]
||
[
"
$STATUS
"
=
"
$RPMISNOTINSTALLED
"
]
;
then
return
$STATUS
fi
...
...
This diff is collapsed.
Click to expand it.
tests/run_command2.sh
100644 → 100755
View file @
5c3f57ed
...
...
@@ -8,6 +8,11 @@ run_command()
$1
2>&1 |
tee
$RC_STDOUT
}
return_big
()
{
return
2021
}
func
()
{
echo
STDERR
>
&2
...
...
@@ -18,3 +23,6 @@ run_command func
cat
$RC_STDOUT
#cat $RC_STDERR
rm
-f
$RC_STDOUT
$RC_STDERR
return_big
echo
$?
This diff is collapsed.
Click to expand it.
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