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
ec0c2092
Commit
ec0c2092
authored
Jun 23, 2018
by
Vitaly Lipatov
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
drop get_rpmpkg_requires
parent
104d3e35
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
2 additions
and
11 deletions
+2
-11
aptU
bin/aptU
+1
-1
alt
share/eterbuild/functions/alt
+0
-9
test_cget_depends.sh
tests/test_cget_depends.sh
+1
-1
No files found.
bin/aptU
View file @
ec0c2092
...
...
@@ -70,7 +70,7 @@ install_packages()
docmd
$SUDO
apt-get
install
$LIST
ALREADYHANDLEDAPT
=
"
$ALREADYHANDLEDAPT
$LIST
"
REQLIST
=
"
$(
get_rpmpkg_require
s
$LIST
)
"
REQLIST
=
"
$(
$ETERBUILDBIN
/rpmreq
s
$LIST
)
"
REQLIST
=
$(
regexp_exclude_list
"
$ALREADYHANDLEDRPM
"
"
$REQLIST
"
)
test
-n
"
$REQLIST
"
||
{
echog
"There is no more req packages to install"
;
return
;
}
...
...
share/eterbuild/functions/alt
View file @
ec0c2092
...
...
@@ -120,12 +120,3 @@ pkg_release_check()
fi
done
}
# TODO: remove for all, use $ rpmreqs instead
# copied from aptU
get_rpmpkg_requires
()
{
assert_var ETERBUILDBIN
$ETERBUILDBIN
/rpmreqs
$@
}
tests/test_cget_depends.sh
View file @
ec0c2092
...
...
@@ -8,7 +8,7 @@ load_mod alt
#testfile=$(echo /var/ftp/pub/Etersoft/RX@Etersoft/testing/CentOS/5/nxclient-*.i586.rpm)
testfile
=
$(
echo
/var/ftp/pub/Etersoft/WINE@Etersoft/2.0-testing/WINE/ALTLinux/Sisyphus/wine-etersoft-
*
.i586.rpm
)
#testfile=$(echo /var/ftp/pub/Etersoft/RX@Etersoft/testing/ALTLinux/Sisyphus/rx-etersoft-*.i586.rpm)
REQLIST
=
"
$(
get_rpmpkg_require
s
-p
"
$testfile
"
)
"
REQLIST
=
"
$(
$ETERBUILDBIN
/rpmreq
s
-p
"
$testfile
"
)
"
echo
$REQLIST
echo
"---"
trans_rpmdeps_to_pkgname
$REQLIST
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