VladPolskiy/webmin
1
0
Fork 0
mirror of https://github.com/webmin/webmin.git synced 2025-07-20 16:48:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix to correctly concatenate if string is empty

Browse Source
This commit is contained in:
Ilia Ross
2025-06-24 13:33:26 +03:00
parent 1607a59239
commit d087f9f024
2 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
makemoduledeb.pl
View File

@ -285,7 +285,7 @@ if (exists($minfo{'deb_requires'})) {
foreach my $debrequire (split(/\s+/, $minfo{'deb_requires'})) { foreach my $debrequire (split(/\s+/, $minfo{'deb_requires'})) {
push(@rrequires, $debrequire); push(@rrequires, $debrequire);
} }
$rdeps .= ", " . join(", ", @rrequires) if (@rrequires); $rdeps .= ($rdeps ? ', ' : '') . join(", ", @rrequires) if (@rrequires);
} }
# Build (append) list of recommended packages (not Webmin modules) # Build (append) list of recommended packages (not Webmin modules)
@ -294,7 +294,8 @@ if (exists($minfo{'deb_recommends'})) {
foreach my $debrecommend (split(/\s+/, $minfo{'deb_recommends'})) { foreach my $debrecommend (split(/\s+/, $minfo{'deb_recommends'})) {
push(@rrecommends, $debrecommend); push(@rrecommends, $debrecommend);
} }
$rrecom .= ", " . join(", ", @rrecommends) if (@rrecommends); $rrecom .= ($rrecom ? ', ' : '') . join(", ", @rrecommends)
if (@rrecommends);
} }
# Build (standalone) list of suggested packages (not Webmin modules) # Build (standalone) list of suggested packages (not Webmin modules)

5
makemodulerpm.pl
View File

@ -312,7 +312,7 @@ if (exists($minfo{'rpm_requires'})) {
foreach my $rpmrequire (split(/\s+/, $minfo{'rpm_requires'})) { foreach my $rpmrequire (split(/\s+/, $minfo{'rpm_requires'})) {
push(@rrequires, $rpmrequire); push(@rrequires, $rpmrequire);
} }
$rdeps .= " " . join(" ", @rrequires) if (@rrequires); $rdeps .= ($rdeps ? ' ' : '') . join(" ", @rrequires) if (@rrequires);
} }
# Build (append) list of recommended packages (not Webmin modules) # Build (append) list of recommended packages (not Webmin modules)
@ -321,7 +321,8 @@ if (exists($minfo{'rpm_recommends'})) {
foreach my $rpmrecommend (split(/\s+/, $minfo{'rpm_recommends'})) { foreach my $rpmrecommend (split(/\s+/, $minfo{'rpm_recommends'})) {
push(@rrecommends, $rpmrecommend); push(@rrecommends, $rpmrecommend);
} }
$rrecom .= " " . join(" ", @rrecommends) if (@rrecommends); $rrecom .= ($rrecom ? ' ' : '') . join(" ", @rrecommends)
if (@rrecommends);
} }
# Build (standalone) list of suggested packages (not Webmin modules) # Build (standalone) list of suggested packages (not Webmin modules)