From a1934581a5e20ff75ae003ab25162ad102e2a13a Mon Sep 17 00:00:00 2001 From: Marc Fiuczynski Date: Fri, 22 Feb 2008 19:47:33 +0000 Subject: [PATCH] - remove superfluous slash in pl_move_dir - do not escape + and - signs in the grep/sed regex to find/remove package+$fcdistro. This does appear a bit fishy as the old code looks correct, but it did not work properly on f8. --- build.common | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/build.common b/build.common index 23d282d0..983ed75a 100644 --- a/build.common +++ b/build.common @@ -609,7 +609,7 @@ function pl_move_dirs() { fi rm -rf ${root}/${datadir} mkdir -p $(dirname ${root}/${datadir}) - ln -nsf /${store}/${datadir} ${root}/${datadir} + ln -nsf ${store}/${datadir} ${root}/${datadir} done } @@ -684,9 +684,9 @@ function pl_parsePkgs () { # grab regular descriptions all=$(grep -v '^#' "$@" | grep --regexp="^${keyword}:" | sed -e "s,${keyword}:,,") # grab additions - add=$(grep -v '^#' "$@" | grep --regexp="^${keyword}+${fcdistro}:" | sed -e "s,${keyword}\+${fcdistro}:,,") + add=$(grep -v '^#' "$@" | grep --regexp="^${keyword}+${fcdistro}:" | sed -e "s,${keyword}+${fcdistro}:,,") # grab exclusions - sub=$(grep -v '^#' "$@" | grep --regexp="^${keyword}\-${fcdistro}:" | sed -e "s,${keyword}\-${fcdistro}:,,") + sub=$(grep -v '^#' "$@" | grep --regexp="^${keyword}-${fcdistro}:" | sed -e "s,${keyword}-${fcdistro}:,,") for i in $all $add; do for exclude in $sub; do -- 2.43.0