diff --git a/bin/aptU b/bin/aptU index a8f5a1b6b350d32f35798de4e323acc09854932d..4ae5a3eaafd29286e4e9dc12c6835d01b1661391 100755 --- a/bin/aptU +++ b/bin/aptU @@ -70,7 +70,7 @@ install_packages() docmd $SUDO apt-get install $LIST ALREADYHANDLEDAPT="$ALREADYHANDLEDAPT $LIST" - REQLIST="$(get_rpmpkg_requires $LIST)" + REQLIST="$($ETERBUILDBIN/rpmreqs $LIST)" REQLIST=$(regexp_exclude_list "$ALREADYHANDLEDRPM" "$REQLIST") test -n "$REQLIST" || { echog "There is no more req packages to install" ; return ; } diff --git a/share/eterbuild/functions/alt b/share/eterbuild/functions/alt index c5df3c817d699a8d87bba04d4da56f264ee0feee..86f2e464e71b5f2fcba1e2269ea5f58859ca9d0f 100644 --- a/share/eterbuild/functions/alt +++ b/share/eterbuild/functions/alt @@ -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 $@ -} - diff --git a/tests/test_cget_depends.sh b/tests/test_cget_depends.sh index e31996c2d62cb1d4c946ef00b1647c5e3e0be427..2060b582b69ecf20010f44c02ec71e597f1301ed 100755 --- a/tests/test_cget_depends.sh +++ b/tests/test_cget_depends.sh @@ -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_requires -p "$testfile")" +REQLIST="$($ETERBUILDBIN/rpmreqs -p "$testfile")" echo $REQLIST echo "---" trans_rpmdeps_to_pkgname $REQLIST