Skip to content

E
etersoft-build-utils
Commit eeb379f9 authored by Vitaly Lipatov's avatar Vitaly Lipatov
Browse files
Options

fix drop_extensions for x86_64 and improve test for it

parent f07ca34c
Hide whitespace changes
Inline Side-by-side
Showing with 7 additions and 4 deletions
share/eterbuild/functions/rpm
View file @ eeb379f9
...@@ -122,8 +122,8 @@ get_binpkg_list() ...@@ -122,8 +122,8 @@ get_binpkg_list()
drop_pkg_extensions() drop_pkg_extensions()
{ {
for i in $@ ; do for i in $@ ; do
echo -n "$(basename $i) " | sed -e "s|\.[a-z0-9]*\.rpm||g" echo -n "$(basename $i) " | sed -e "s|\.[a-z_0-9]*\.rpm||g"
done done | filter_strip_spaces
} }
# TODO: add get_update_repo_command # TODO: add get_update_repo_command
......
tests/test_get_bin.sh
View file @ eeb379f9
...@@ -3,10 +3,13 @@ ...@@ -3,10 +3,13 @@
. `dirname $0`/../share/eterbuild/functions/common . `dirname $0`/../share/eterbuild/functions/common
load_mod rpm hasher load_mod rpm hasher
MENV=SS MENVARG=$1
test -n "$MENVARG" || MENVARG=-SS
set_hasherdir set_hasherdir
for i in `ls -1 $HASHERDIR/repo/SRPMS.hasher` ; do for i in `ls -1 $HASHERDIR/repo/SRPMS.hasher` ; do
echo "get for $i:" echo "get for $i:"
get_binpkg_list $HASHERDIR/repo/$DEFAULTARCH/RPMS.hasher $(basename $i) LISTNAMES=`get_binpkg_list $HASHERDIR/repo/$DEFAULTARCH/RPMS.hasher $(basename $i)`
echo $LISTNAMES
echo "without ext: $(drop_pkg_extensions $LISTNAMES)"
done done
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment