aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorrhatto <rhatto@04377dda-e619-0410-9926-eae83683ac58>2007-12-23 19:30:53 +0000
committerrhatto <rhatto@04377dda-e619-0410-9926-eae83683ac58>2007-12-23 19:30:53 +0000
commit24408f81d73eed8c3e9a2d59bc8cd6d742e3688d (patch)
tree9051692f153f644634469cac13aafb58a3b3b1f3
parent465674456d90b1df39b23fb2083ca17fdc9c36b3 (diff)
downloadsimplepkg-24408f81d73eed8c3e9a2d59bc8cd6d742e3688d.tar.gz
simplepkg-24408f81d73eed8c3e9a2d59bc8cd6d742e3688d.tar.bz2
simplepkg 0.6pre14 fixes a minor bug in simplaret
git-svn-id: svn+slack://slack.fluxo.info/var/svn/simplepkg@477 04377dda-e619-0410-9926-eae83683ac58
-rw-r--r--trunk/doc/CHANGELOG5
-rwxr-xr-xtrunk/simplepkg.SlackBuild2
-rwxr-xr-xtrunk/src/simplaret2
3 files changed, 7 insertions, 2 deletions
diff --git a/trunk/doc/CHANGELOG b/trunk/doc/CHANGELOG
index 0920f98..627b9c1 100644
--- a/trunk/doc/CHANGELOG
+++ b/trunk/doc/CHANGELOG
@@ -1,6 +1,11 @@
simplepkg changelog
===================
+0.6pre14
+========
+
+ - simplaret: ignoring slack-required lines starting which "#"
+
0.6pre13
========
diff --git a/trunk/simplepkg.SlackBuild b/trunk/simplepkg.SlackBuild
index 462aad3..48351b0 100755
--- a/trunk/simplepkg.SlackBuild
+++ b/trunk/simplepkg.SlackBuild
@@ -18,7 +18,7 @@
PACKAGE="simplepkg"
PACK_DIR="package-$PACKAGE"
BUILD=${BUILD:=1rha}
-VERSION="0.6pre13"
+VERSION="0.6pre14"
ARCH="noarch"
LIBEXEC="/usr/libexec/$PACKAGE"
BINDIR="/usr/bin"
diff --git a/trunk/src/simplaret b/trunk/src/simplaret
index 7cf7796..f0139c6 100755
--- a/trunk/src/simplaret
+++ b/trunk/src/simplaret
@@ -949,7 +949,7 @@ function simplaret_install {
if [ -f "$slack_required" ] && [ "$DEPENDENCY_CHECKING" == "1" ]; then
# this routine checks for dependencies in package's slack-required
# procedure adapted from createpkg script
- ( cat $slack_required | while read dep; do
+ ( grep -v '^#' $slack_required | while read dep; do
if [ ! -z "$dep" ]; then
dependency="`echo $dep | awk '{ print $1 }'`"
simplaret_solve_dep $name $dependency $root