summaryrefslogtreecommitdiffstats
path: root/bin
diff options
context:
space:
mode:
authorJustin Davis <jrcd83@gmail.com>2012-06-15 02:09:18 +0200
committerJustin Davis <jrcd83@gmail.com>2012-06-15 02:09:18 +0200
commit3e761dc5ad3699c24c182400a76ed3d532e1e7d5 (patch)
tree878cfba8f0f15dfb85f78faee84e0b3dbde9f506 /bin
parent12d8b95b387d64ddc51102f7704ae000b225dd4c (diff)
downloadgenpkg-3e761dc5ad3699c24c182400a76ed3d532e1e7d5.tar.gz
genpkg-3e761dc5ad3699c24c182400a76ed3d532e1e7d5.tar.xz
Comment was in the wrong spot.
Diffstat (limited to 'bin')
-rwxr-xr-xbin/genpkg5
1 files changed, 3 insertions, 2 deletions
diff --git a/bin/genpkg b/bin/genpkg
index 22ec225..d9ffcc5 100755
--- a/bin/genpkg
+++ b/bin/genpkg
@@ -100,8 +100,6 @@ do
[ -d PKGTREE ] && rm -rf PKGTREE
mkdir PKGTREE
- # Duplicate the version in case modpkg modifies it. vervar will remove a
- # redundant ver field that is the same as pkgver.
trap 'rm -f PKGDATA' 1 2 15
PREPSPATH="$prepd" PKGVAR="$vard" prepkg "$pkg" > PKGDATA
ret=$?
@@ -116,6 +114,8 @@ do
if [ -f "$mod" -a -r "$mod" ]
then
trap 'rm -f PKGDATA.new' 1 2 15
+
+ # Duplicate the version in case modpkg modifies it.
if cat PKGDATA | dupver | modpkg "$mod" > PKGDATA.new
then
echo "Modified with $mod." 1>&2
@@ -124,6 +124,7 @@ do
echo "$prog: modpkg failed." 1>&2
[ "$GENPKGDBG" ] || rm PKGDATA.new
fi
+
trap '' 1 2 15
fi