simplaret: fix at dependency checking

git-svn-id: svn+slack://slack.fluxo.info/var/svn/simplepkg@664 04377dda-e619-0410-9926-eae83683ac58

diff --git a/trunk/src/createpkg b/trunk/src/createpkg
index 641496e46006c933a473da1e163801a5d06c7e4c..e8aad31aeec847e21cc27a53c94ea104f314c009 100644 (file)
--- 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 236b4bccc84d18882913409246053026b7c03467..861172158938bd2608411bd6a280deed701102ca 100755 (executable)
--- 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