aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2006-04-01 01:24:26 +0000
committerAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2006-04-01 01:24:26 +0000
commit0138f6ee9982d23478edd74d299bb73b8437ce6d (patch)
treeb1cf00b10dc9366594bdb0e289e59aaf14de81f8
parent2a73eafe414847de29136133aad15ba111ee6ddb (diff)
downloadpaludis-0138f6ee9982d23478edd74d299bb73b8437ce6d.tar.gz
paludis-0138f6ee9982d23478edd74d299bb73b8437ce6d.tar.xz
Don't try to md5sum weird things, like /dev/zero
-rw-r--r--ebuild/builtin_merge.bash4
1 files changed, 3 insertions, 1 deletions
diff --git a/ebuild/builtin_merge.bash b/ebuild/builtin_merge.bash
index a0eb7b8..486a9d5 100644
--- a/ebuild/builtin_merge.bash
+++ b/ebuild/builtin_merge.bash
@@ -62,8 +62,10 @@ builtin_merge()
echo "dir ${ff}" >> ${dbdir}/CONTENTS
elif [[ -L "${f}" ]] ; then
echo "sym ${ff} -> $(readlink ${f} ) $(stat -c '%Y' ${f} )" >> ${dbdir}/CONTENTS
- else
+ elif [[ -f "${f}" ]] ; then
echo "obj ${ff} $(md5sum ${f} | cut -d ' ' -f1 ) $(stat -c '%Y' ${f} )" >> ${dbdir}/CONTENTS
+ else
+ echo "misc ${ff} $(stat -c '%Y' ${f} )" >> ${dbdir}/CONTENTS
fi
done
fi