Commit 692d6ba7 authored by Vitaly Lipatov's avatar Vitaly Lipatov

epm repack: fix path to eepm.yaml with metainfo

parent 65943167
...@@ -109,7 +109,7 @@ __epm_pack() ...@@ -109,7 +109,7 @@ __epm_pack()
mv -v $pkgnames "$EPMCURDIR" || fatal mv -v $pkgnames "$EPMCURDIR" || fatal
local i local i
for i in "$returntarname" ; do for i in $returntarname ; do
[ -r "$i.eepm.yaml" ] && mv -v "$i.eepm.yaml" "$EPMCURDIR" [ -r "$i.eepm.yaml" ] && mv -v "$i.eepm.yaml" "$EPMCURDIR"
done done
......
...@@ -136,10 +136,13 @@ __epm_repack_to_rpm() ...@@ -136,10 +136,13 @@ __epm_repack_to_rpm()
alpkg=$(basename $pkg) alpkg=$(basename $pkg)
# don't use abs package path: copy package to temp dir and use there # don't use abs package path: copy package to temp dir and use there
cp -l $verbose $pkg $tmpbuilddir/../$alpkg 2>/dev/null || cp $verbose $pkg $tmpbuilddir/../$alpkg || fatal cp -l $verbose $pkg $tmpbuilddir/../$alpkg 2>/dev/null || cp $verbose $pkg $tmpbuilddir/../$alpkg || fatal
[ -r "$pkg.eepm.yaml" ] && cp $verbose $pkg.eepm.yaml $tmpbuilddir/../$alpkg.eepm.yaml
cd $tmpbuilddir/../ || fatal cd $tmpbuilddir/../ || fatal
# fill alpkg and SUBGENERIC # fill alpkg and SUBGENERIC
__prepare_source_package "$(realpath $alpkg)" __prepare_source_package "$(realpath $alpkg)"
# override abspkg
abspkg="$(realpath $alpkg)"
cd $tmpbuilddir/ || fatal cd $tmpbuilddir/ || fatal
local fakeroot local fakeroot
......
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