OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Thomas Lotterer
Root: /e/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-re Date: 30-Jul-2003 14:30:12
Branch: HEAD Handle: 2003073013301100
Modified files:
openpkg-re openpkg-dev
Log:
solve force/detection mismatch in favor of humans
Summary:
Revision Changes Path
1.136 +15 -9 openpkg-re/openpkg-dev
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-re/openpkg-dev
============================================================================
$ cvs diff -u -r1.135 -r1.136 openpkg-dev
--- openpkg-re/openpkg-dev 29 Jul 2003 15:35:14 -0000 1.135
+++ openpkg-re/openpkg-dev 30 Jul 2003 12:30:11 -0000 1.136
@@ -614,9 +614,12 @@
OPENPKG_CTAG="${RV}"
# canonify OPENPKG_EXEC
- canonifybranch "${OPENPKG_EXEC:-$OPENPKG_CTAG}"
- matchinstance "${RV}" exact
- OPENPKG_EXEC="${RV}"
+ echo ${OPENPKG_EXEC} | grep / >/dev/null
+ if [ $? -ne 0 ]; then
+ canonifybranch "${OPENPKG_EXEC}"
+ matchinstance "${RV}" exact
+ OPENPKG_EXEC="${RV}"
+ fi
# set P,B,E without having "cd()" already in place
P="${OPENPKG_SPEC}"
@@ -704,9 +707,10 @@
CD_FUNC_PX="[1mP=\${P}[m"
CD_FUNC_PD="P=\${P}."
else
- # forced; detected and mismatch; keep detected; print forced
black ! detected normal (aka forced exclamation mark detected)
+ # forced; detected and mismatch; keep forced; print forced
black ! detected normal (aka forced exclamation mark detected)
CD_FUNC_PX="[1mP=\${OPENPKG_SPEC}[m![31m\${P}[m"
- CD_FUNC_PD="P=\${OPENPKG_SPEC}.\${P}!"
+ CD_FUNC_PD="P=\${OPENPKG_SPEC}!\${P}"
+ P="\${OPENPKG_SPEC}"
fi
fi
fi
@@ -735,9 +739,10 @@
CD_FUNC_BX="[1mB=\${B}[m"
CD_FUNC_BD="B=\${B}."
else
- # forced; detected and mismatch; keep detected; print forced
black ! detected normal (aka forced exclamation mark detected)
+ # forced; detected and mismatch; keep forced; print forced
black ! detected normal (aka forced exclamation mark detected)
CD_FUNC_BX="[1mB=\${OPENPKG_CTAG}[m![31m\${B}[m"
- CD_FUNC_BD="B=\${OPENPKG_CTAG}.\${B}!"
+ CD_FUNC_BD="B=\${OPENPKG_CTAG}!\${B}"
+ B="\${OPENPKG_CTAG}"
fi
fi
fi
@@ -766,9 +771,10 @@
CD_FUNC_EX="[1mE=\${E}[m"
CD_FUNC_ED="E=\${E}."
else
- # forced; detected and mismatch; keep detected; print forced
black ! detected normal (aka forced exclamation mark detected)
+ # forced; detected and mismatch; keep forced; print forced
black ! detected normal (aka forced exclamation mark detected)
CD_FUNC_EX="[1mE=\${OPENPKG_EXEC}[m![31m\${E}[m"
- CD_FUNC_ED="E=\${OPENPKG_EXEC}.\${E}!"
+ CD_FUNC_ED="E=\${OPENPKG_EXEC}!\${E}"
+ E="\${OPENPKG_EXEC}"
fi
fi
fi
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
