[pacman-dev] My makepkg changes/updates
Dan McGee
dpmcgee at gmail.com
Thu Dec 21 14:36:30 EST 2006
> One note:
> On 12/21/06, Dan McGee <dpmcgee at gmail.com> wrote:
> > - rm -rf "$SRCDEST"/*
> > + rm -rf "$SRCDEST/*"
>
> This won't glob anymore. It will try to remove a literal file named "*"
ahh, quite correct.
Final patch, fixes small issues:
$ cat diff234pm.diff
Index: makepkg
===================================================================
RCS file: /home/cvs-pacman/pacman-lib/scripts/makepkg,v
retrieving revision 1.24
diff -u -u -r1.24 makepkg
--- makepkg 21 Dec 2006 19:11:22 -0000 1.24
+++ makepkg 21 Dec 2006 19:34:08 -0000
@@ -293,7 +293,7 @@
ARGLIST=$@
-#Source user-specific makepkg.conf overrides
+#Source makepkg.conf; fail if it is not found
if [ -f /etc/makepkg.conf ]; then
source /etc/makepkg.conf
else
@@ -303,7 +303,7 @@
#Source user-specific makepkg.conf overrides
if [ -f ~/.makepkg.conf ]; then
- source ~/.makepkg.conf
+ source ~/.makepkg.conf
fi
while [ "$#" -ne "0" ]; do
@@ -494,8 +494,8 @@
unset deplist makedeplist
# fix flyspray bug #5973
-if [ "$NODEPS" = "1" -o "$GENINTEG" = "1" -o "$NOBUILD" = "1" ]; then
- warning "skipping dependecy checks"
+if [ "$NODEPS" = "1" -o "$GENINTEG" = "1" -o "$NOBUILD" = "1" -o
"$REPKG" = "1" ]; then
+ warning "skipping dependency checks"
elif [ $(type -p pacman) ]; then
msg "Checking Runtime Dependencies..."
deplist=$(checkdeps ${depends[@]})
More information about the pacman-dev
mailing list