Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
E
etersoft-build-utils
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
korinf
etersoft-build-utils
Commits
33f1f12e
Commit
33f1f12e
authored
Apr 04, 2017
by
Vitaly Lipatov
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
rpmreqs: fix for handle requires with dot with names (exclude .so. only)
parent
621bd637
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
4 additions
and
1 deletion
+4
-1
rpmreqs
bin/rpmreqs
+4
-1
No files found.
bin/rpmreqs
View file @
33f1f12e
...
...
@@ -131,7 +131,7 @@ trans_rpmdeps_to_pkgname_lav()
REQLIST
=
$(
estrlist reg_wordexclude
"
$ALREADYHANDLEDRPM
"
"
$REQLIST
"
)
# FIXME: strange regexp for drop libNAME.so.NUM and perl(Package) and /bin/sh
REALPKGNAMELIST
=
$(
estrlist reg_exclude
"
\.
/.* (.*"
"
$REQLIST
"
)
REALPKGNAMELIST
=
$(
estrlist reg_exclude
"
\.
so
\.
/.* (.*"
"
$REQLIST
"
)
# FIXME: external list? Set priorities/
REQCONVLIST
=
$(
estrlist exclude
"
$REALPKGNAMELIST
"
"
$REQLIST
"
| filter_multiple_provides |
sed
-e
"s|(64bit)|.*(64bit)|g"
)
...
...
@@ -141,6 +141,8 @@ trans_rpmdeps_to_pkgname_lav()
#REQLIST=$(regexp_exclude_list "VIRTREQ" "$REQLIST")
# TODO: we have store_output function
TFILE
=
$(
make_temp_file
)
PKGFILES
=
if
[
-n
"
$REQCONVLIST
"
]
;
then
PKGFILES
=
$(
LANG
=
C apt-get
install
--print-uris
$REQCONVLIST
2>
$TFILE
| egrep
"(^Selecting|.* is already the newest version.)"
|
sed
-e
"s|^Selecting ||g"
|
sed
-e
"s| is already the newest version.||g"
|
sed
-e
"s| .*||g"
|
sort
-u
| filter_pkgname
)
||
warning
"Error return code from apt-get install"
if
grep
-q
"is a virtual package provided by"
$TFILE
;
then
local
INSTALLMARK
=
"
\[
Installed
\]
"
...
...
@@ -153,6 +155,7 @@ trans_rpmdeps_to_pkgname_lav()
fi
PKGFILES
=
"
$PKGFILES
$PKGINSTALLED
"
fi
fi
if
grep
-q
"Couldn't find package"
$TFILE
;
then
fatal
"
$(
cat
$TFILE
|
grep
"Couldn't find package"
)
"
...
...
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