keremet/mkimage-profiles
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

lists: drop leading/trailing whitespace

Browse Source 
This is a workaround for presumably alterator-pkg's
misbehaviour given a pkglist with a line ending with
a space character; my particular case grew from @E2K
suffix resulting in "%name@e2k %name@e2kv4" which,
in its turn, became "%name " in e2k-arch build.

Installer complained about being

  unable to install in selected configuration

with /tmp/install2.log "clarifying" the problem to be
%name  being unavailable (while %name package was there
in both RPMS.main and metadata)... not obvious at all!

So while downstream should be hardened either, let's do
what we can do here.
This commit is contained in:
Michael Shigorin 2018-08-17 18:58:41 +03:00
parent 528cabd5c0
commit 1a525c89fb
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
pkg.in/lists/Makefile
View File

@ -43,7 +43,8 @@ grep-archdep:
sed -ri "s/\\<([^@ ]*)@X86\\>/\\1@i586 \\1@x86_64/g" __; \
sed -ri "s/\\<([^@ ]*)@IA32\\>/\\1@i586 i586-\\1@x86_64/g" __;\
sed -rni "s/\\<([^@ ]*)\\>|\\<([^@ ]*)@$a\\>/\\1\\2/pg" __; \
sed -ri "s/\\<([^@ ]*)@[^@ ]+\\> *//g" __'
sed -ri "s/\\<([^@ ]*)@[^@ ]+\\> *//g" __; \
sed -ri "s/^ +//;s/ +$$//" __'
# do beforehand as foreach gets expanded before recipe execution
$(TARGET):