diff options
| author | rhatto <rhatto@04377dda-e619-0410-9926-eae83683ac58> | 2008-12-15 18:57:14 +0000 |
|---|---|---|
| committer | rhatto <rhatto@04377dda-e619-0410-9926-eae83683ac58> | 2008-12-15 18:57:14 +0000 |
| commit | 7ed5f3b392212c095ee9820813d2b04d7b7e689c (patch) | |
| tree | b6e525c90e69008637370daa1ff10929f0d6a704 /trunk | |
| parent | e98a84fdc8bd701a8630c0849be4ffb83bada9b2 (diff) | |
| download | simplepkg-7ed5f3b392212c095ee9820813d2b04d7b7e689c.tar.gz simplepkg-7ed5f3b392212c095ee9820813d2b04d7b7e689c.tar.bz2 | |
simplaret: fix at dependency checking
git-svn-id: svn+slack://slack.fluxo.info/var/svn/simplepkg@664 04377dda-e619-0410-9926-eae83683ac58
Diffstat (limited to 'trunk')
| -rw-r--r-- | trunk/src/createpkg | 4 | ||||
| -rwxr-xr-x | trunk/src/simplaret | 3 |
2 files changed, 4 insertions, 3 deletions
diff --git a/trunk/src/createpkg b/trunk/src/createpkg index 641496e..e8aad31 100644 --- a/trunk/src/createpkg +++ b/trunk/src/createpkg @@ -144,7 +144,7 @@ function solve_dep { INSTALLED=`eval "ls /var/log/packages/ | grep -E '^$PACK-[^-]+-[^-]+-[^-]+$'"` CHECK=$? - # TODO: Make check version procedures + # TODO: check dependency versions if [ -z "$INSTALLED" ]; then if [ $CHECK -ne 0 ]; then # Check package in SlackBuilds tree @@ -335,7 +335,7 @@ function create_repo_folder { local folder="$1" basedir if [ ! -d "$folder" ]; then - echo "Packages folder $folder not found. Creating it." + echo "Creating packages folder $folder..." basedir="`dirname $folder`" if [ -d "$basedir/.svn" ] && ! svn_check $folder; then ( diff --git a/trunk/src/simplaret b/trunk/src/simplaret index 236b4bc..8611721 100755 --- a/trunk/src/simplaret +++ b/trunk/src/simplaret @@ -960,9 +960,10 @@ function simplaret_install { if [ -f "$package" ]; then if [ -f "$slack_required" ] && [ "$DEPENDENCY_CHECKING" == "1" ]; then + # TODO: check dependency versions # this routine checks for dependencies in package's slack-required # procedure adapted from createpkg script - ( grep -v '^#' $slack_required | while read dep; do + ( grep -v '^#' $slack_required | awk '{ print $1 }' | while read dep; do if [ ! -z "$dep" ]; then dependency="`echo $dep | awk '{ print $package }'`" simplaret_solve_dep $name $dependency $root |