Another patch :)
This one targets the 3 dep check functions (handledeps, resolvedeps, removedeps). The bulk of the changes are whitespace and removing the repetitive if..then...else checks. Also some bits have been reordered to stop functions/external programs being called unnecessarily.
This still includes the fakeroot hacks, if you need it rediffed without the fakeroot hacks, I'll post a new patch.
Andrew
------------------------------------------------------------ revno: 3 committer: Andrew Fyfe andrew@neptune-one.net branch nick: feature_handledeps timestamp: Sat 2007-03-24 12:12:48 +0000 message: * cleaned up handledeps () resolvedeps () removedeps ()
=== modified file 'scripts/makepkg' --- old/scripts/makepkg 2007-03-24 03:49:27 +0000 +++ new/scripts/makepkg 2007-03-24 12:12:35 +0000 @@ -191,91 +191,85 @@ }
handledeps() { - local missingdeps=0 + local R_DEPS_SATISFIED=0 + local R_DEPS_MISSING=1 + + [ $# -eq 0 ] && return $R_DEPS_SATISFIED + local deplist="$*" - local depstrip="" - local striplist="" - local haveperm=0 - if [ ( "$EUID" = "0" -a "$INFAKEROOT" != "1" ) -o "$SUDO" = 1 ]; then - haveperm=1 - fi - + local striplist + local dep for dep in $deplist; do - depstrip=$(echo $dep | sed 's|=.*$||' | sed 's|>.*$||' | sed 's|<.*$||') - striplist="$striplist $depstrip" + striplist="$striplist $(echo $dep | sed -e 's|=.*$||' -e 's|>.&$||' -e 's|<.*$||')" done
- if [ "$deplist" != "" -a $haveperm -eq 1 ]; then - if [ "$DEP_BIN" = "1" -a "$SUDO" = "1" ]; then - # install missing deps from binary packages (using pacman -S and sudo) - msg "Installing missing dependencies..." + if [ "$DEP_SRC" = "0" -a "$DEP_BIN" = "0" ]; then + return $R_DEPS_MISSING + elif [ "$SUDO" = 0 -a $EUID -gt 0 ]; then + warning "Cannot auto-install missing dependencies as a normal user without sudo!" + plain "Run makepkg as root or with -S to resolve dependencies automatically." + return $R_DEPS_MISSING + fi + + if [ "$DEP_BIN" = "1" ]; then + # install missing deps from binary packages (using pacman -S) + msg "Installing missing dependencies..." + local ret=0 + + if [ "$SUDO" = 1 ]; then if [ "$INFAKEROOT" = "1" ]; then # kinda hacky, but we need to make pacman think that we're NOT # in fakeroot so it will go ahead and install the dependencies. FAKEROOTKEY2=$FAKEROOTKEY unset FAKEROOTKEY fi - sudo pacman $PACMAN_OPTS -S $striplist - if [ $? -eq 1 ]; then - error "Pacman failed to install missing dependencies." - exit 1 - fi + sudo pacman $PACMAN_OPTS -S $striplist || ret=$? if [ "$INFAKEROOT" = "1" ]; then export FAKEROOTKEY=$FAKEROOTKEY2 unset FAKEROOTKEY2 fi - elif [ "$DEP_BIN" = "1" ]; then - # install missing deps from binary packages (using pacman -S) - msg "Installing missing dependencies..." - pacman $PACMAN_OPTS -S $striplist - if [ $? -eq 1 ]; then - error "Pacman failed to install missing dependencies." - exit 1 - fi - elif [ "$DEP_SRC" = "1" ]; then - # install missing deps by building them from source. - # we look for each package name in $SRCROOT and build it. - if [ "$SRCROOT" = "" ]; then - error "Source root cannot be found - please make sure it is specified in /etc/makepkg.conf" - exit 1 - fi - # TODO: handle version comparators (eg, glibc>=2.2.5) - msg "Building missing dependencies..." - for dep in $striplist; do - candidates=$(find $SRCROOT -type d -name "$dep") - if [ "$candidates" = "" ]; then - error "Could not find "$dep" under $SRCROOT" - exit 1 - fi - success=0 - for pkgdir in $candidates; do - if [ -f "$pkgdir/$BUILDSCRIPT" ]; then - cd "$pkgdir" - if [ "$RMDEPS" = "1" ]; then - makepkg -i -c -b -r -w $PKGDEST - else - makepkg -i -c -b -w $PKGDEST - fi - if [ $? -eq 0 ]; then - success=1 - break - fi - fi - done - if [ "$success" = "0" ]; then - error "Failed to build "$dep"" - exit 1 + else + pacman $PACMAN_OPTS -S $striplist || ret=$? + fi + + if [ $ret -ne 0 ]; then + error "Pacman failed to install missing dependencies." + exit 1 # TODO: error code + fi + elif [ "$DEP_SRC" = "1" ]; then + msg "Building missing dependencies..." + + # install missing deps by building them from source. + # we look for each package name in $SRCROOT and build it. + if [ "$SRCROOT" = "" ]; then + error "Source root cannot be found - please make sure it is specified in /etc/makepkg.conf" + exit 1 # TODO: error code + fi + + # TODO: handle version comparators (eg, glibc>=2.2.5) + for dep in $striplist; do + local candidates="$(find "$SRCROOT" -type d -name "$dep")" + if [ "$candidates" = "" ]; then + error "Could not find "$dep" under $SRCROOT" + exit 1 # TODO: error code + fi + + local makepkg_opts='-i -c -b' + [ "$RMDEPS" = "1" ] && makepkg_opts="$makepkg_opts -r" + local ret + local pkgdir + for pkgdir in $candidates; do + if [ -f "$pkgdir/$BUILDSCRIPT" ]; then + cd "$pkgdir" + ret=0 + PKGDEST="$PKGDEST" makepkg $makepkg_opts || ret=$? + [ $ret -eq 0 ] && continue 2 fi done - else - missingdeps=1 - fi - elif [ "$deplist" != "" -a $haveperm -eq 0 ]; then - if [ "$DEP_SRC" = "1" -o "$DEP_BIN" = "1" ]; then - warning "Cannot auto-install missing dependencies as a normal user without sudo!" - plain "Run makepkg as root or with -S to resolve dependencies automatically." - fi - missingdeps=1 + + error "Failed to build "$dep"" + exit 1 # TODO: error code + done fi
# rerun any additional sh scripts found in /etc/profile.d/ @@ -286,53 +280,51 @@ fi done
- return $missingdeps + return $R_DEPS_SATISFIED }
resolvedeps() { - deplist="" - newdeplist="" - - deplist=$(checkdeps $*) - if [ -n "${deplist}" ]; then - handledeps $deplist - if [ $? -eq 0 ]; then - # check deps again to make sure they were resolved - newdeplist=$(checkdeps $*) - if [ -n "${newdeplist}" ]; then - error "Failed to install all missing dependencies." - fi - else - newdeplist="$deplist" - fi - fi - - # if new dep list is not empty, print the list - if [ -n "${newdeplist}" ]; then - msg "Missing Dependencies:" - for dep in ${newdeplist}; do - msg2 "${dep}" - done - return 1 - else - return 0 - fi + local R_DEPS_SATISFIED=0 + local R_DEPS_MISSING=0 + + deplist="$(checkdeps $*)" + [ "$deplist" = "" ] && return $R_DEPS_SATISFIED + + if handledeps $deplist; then + # check deps again to make sure they were resolved + deplist="$(checkdeps $*)" + [ "$deplist" = "" ] && return $R_DEPS_SATISFIED + elif [ "$DEP_BIN" = "1" -o "$DEP_SRC" = "1" ]; then + error "Failed to install all missing dependencies." + fi + + msg "Missing Dependencies:" + local dep + for dep in $deplist; do + msg2 "$dep" + done + + return $R_DEPS_MISSING }
# fix flyspray bug #5923 removedeps() { + [ "$RMDEPS" = "0" ] && return + [ "$SUDO" = "0" -a $EUID -gt 0 ] && return + # runtimedeps and buildtimedeps are set when resolving deps local deplist="$runtimedeps $buildtimedeps" - local depstrip="" - local striplist="" - + local striplist + + [ "$deplist" = "" ] && return + + local dep for dep in $deplist; do - depstrip=$(echo $dep | sed 's|=.*$||' | sed 's|>.*$||' | sed 's|<.*$||') - striplist="$striplist $depstrip" + striplist="$striplist $(echo $dep | sed -e 's|=.*$||' -e 's|>.*$||' -e 's|<.*$||')" done
- if [ "$RMDEPS" = "1" -a "$SUDO" = "1" -a -n "$deplist" ]; then - msg "Removing installed dependencies..." + msg "Removing installed dependencies..." + if [ "$SUDO" = "1" ]; then if [ "$INFAKEROOT" = "1" ]; then export FAKEROOTKEY2=$FAKEROOTKEY unset FAKEROOTKEY @@ -342,8 +334,7 @@ export FAKEROOTKEY=$FAKEROOTKEY2 unset FAKEROOTKEY2 fi - elif [ "$RMDEPS" = "1" -a "$EUID" = "0" -a "$INFAKEROOT" != "1" -a -n "$deplist" ]; then - msg "Removing installed dependencies..." + else pacman $PACMAN_OPTS -Rs $striplist fi }
On 3/24/07, Andrew Fyfe andrew@neptune-one.net wrote:
Another patch :)
This one targets the 3 dep check functions (handledeps, resolvedeps, removedeps). The bulk of the changes are whitespace and removing the repetitive if..then...else checks. Also some bits have been reordered to stop functions/external programs being called unnecessarily.
This still includes the fakeroot hacks, if you need it rediffed without the fakeroot hacks, I'll post a new patch.
Andrew
Cleaning out the email inbox...if this still applies and we haven't already done the cleanups, can you push it to your git tree?
-Dan
Dan McGee wrote:
On 3/24/07, Andrew Fyfe andrew@neptune-one.net wrote:
Another patch :)
This one targets the 3 dep check functions (handledeps, resolvedeps, removedeps). The bulk of the changes are whitespace and removing the repetitive if..then...else checks. Also some bits have been reordered to stop functions/external programs being called unnecessarily.
This still includes the fakeroot hacks, if you need it rediffed without the fakeroot hacks, I'll post a new patch.
Andrew
Cleaning out the email inbox...if this still applies and we haven't already done the cleanups, can you push it to your git tree?
-Dan
pacman-dev mailing list pacman-dev@archlinux.org http://archlinux.org/mailman/listinfo/pacman-dev
Yes, I'll apply this to my working branch and push it tonight.
Andrew
On 5/30/07, Andrew Fyfe andrew@neptune-one.net wrote:
Dan McGee wrote:
On 3/24/07, Andrew Fyfe andrew@neptune-one.net wrote:
Another patch :)
This one targets the 3 dep check functions (handledeps, resolvedeps, removedeps). The bulk of the changes are whitespace and removing the repetitive if..then...else checks. Also some bits have been reordered to stop functions/external programs being called unnecessarily.
This still includes the fakeroot hacks, if you need it rediffed without the fakeroot hacks, I'll post a new patch.
Andrew
Cleaning out the email inbox...if this still applies and we haven't already done the cleanups, can you push it to your git tree?
-Dan
Yes, I'll apply this to my working branch and push it tonight.
Andrew
Andrew,
This one disappeared on me before I had a chance to look it over...any chance you still have it sitting around in a branch? If not, 'git lost-found' may be your friend, it may help you find it even if you thought you deleted it.
-Dan
Dan McGee wrote:
On 5/30/07, Andrew Fyfe andrew@neptune-one.net wrote:
Dan McGee wrote:
On 3/24/07, Andrew Fyfe andrew@neptune-one.net wrote:
Another patch :)
This one targets the 3 dep check functions (handledeps, resolvedeps, removedeps). The bulk of the changes are whitespace and removing the repetitive if..then...else checks. Also some bits have been reordered to stop functions/external programs being called unnecessarily.
This still includes the fakeroot hacks, if you need it rediffed without the fakeroot hacks, I'll post a new patch.
Andrew
Cleaning out the email inbox...if this still applies and we haven't already done the cleanups, can you push it to your git tree?
-Dan
Yes, I'll apply this to my working branch and push it tonight.
Andrew
Andrew,
This one disappeared on me before I had a chance to look it over...any chance you still have it sitting around in a branch? If not, 'git lost-found' may be your friend, it may help you find it even if you thought you deleted it.
-Dan
pacman-dev mailing list pacman-dev@archlinux.org http://archlinux.org/mailman/listinfo/pacman-dev
Oops, I was using working for something else, I've put the makepkg branch up, all the patches are there.
Andrew
On 6/1/07, Andrew Fyfe andrew@neptune-one.net wrote:
Oops, I was using working for something else, I've put the makepkg branch up, all the patches are there.
Andrew
While looking this over, I've noticed that we are calling exit an awful lot from the functions. Shouldn't we contain the exit calls to the main body of code, and use return statements to get the control back to there to do the actual exiting? Just a thought, comments welcome.
-Dan
Dan McGee wrote:
On 6/1/07, Andrew Fyfe andrew@neptune-one.net wrote:
Oops, I was using working for something else, I've put the makepkg branch up, all the patches are there.
Andrew
While looking this over, I've noticed that we are calling exit an awful lot from the functions. Shouldn't we contain the exit calls to the main body of code, and use return statements to get the control back to there to do the actual exiting? Just a thought, comments welcome.
-Dan
pacman-dev mailing list pacman-dev@archlinux.org http://archlinux.org/mailman/listinfo/pacman-dev
Yeah, you're right. There's some serious restructuring required in makepkg. As more and more features have been hacked into makepkg it has become rather messy. The fakeroot patches and the patches I pushed to my makepkg branch clean up most of the functions, I've still to tidy up check_{option,buildenv}. Here's a list of other changes that I think need made to makepkg...
- limit exit calls to the main() body (as you suggested) - replace the exit calls with a call to a clean up function eg die() { local EXIT_CODE=$1; shift if [ $EXIT_CODE -gt 0 ]; then error "$@" fi
if [ RMDEPS && DEPS_INSTALLED ]; then remove_deps fi
...
exit $EXIT_CODE } - move download source, checksum check/generate, and extract source into functions, this should make it a little easier to follow the flow of the script. - remove clean cache, does it get used? I rather write a separate script and put it in contrib/ - Remove '--usesudo', Always use sudo unless '--asroot' is passed. - Remove '--log', Always create a build log. - Remove '--nocolor', This depends on the new isatty in initscripts
Thoughts, comments and ideas welcome?
Andrew
On 6/1/07, Andrew Fyfe andrew@neptune-one.net wrote:
Dan McGee wrote:
On 6/1/07, Andrew Fyfe andrew@neptune-one.net wrote:
Oops, I was using working for something else, I've put the makepkg branch up, all the patches are there.
Andrew
While looking this over, I've noticed that we are calling exit an awful lot from the functions. Shouldn't we contain the exit calls to the main body of code, and use return statements to get the control back to there to do the actual exiting? Just a thought, comments welcome.
-Dan
Yeah, you're right. There's some serious restructuring required in makepkg. As more and more features have been hacked into makepkg it has become rather messy. The fakeroot patches and the patches I pushed to my makepkg branch clean up most of the functions, I've still to tidy up check_{option,buildenv}. Here's a list of other changes that I think need made to makepkg...
- limit exit calls to the main() body (as you suggested)
Obviously I agree.
- replace the exit calls with a call to a clean up function eg
die() { local EXIT_CODE=$1; shift if [ $EXIT_CODE -gt 0 ]; then error "$@" fi
if [ RMDEPS && DEPS_INSTALLED ]; then remove_deps fi ... exit $EXIT_CODE}
Probably not a bad idea, although let's get some other opinions. die is an awfully harsh name, perhaps just cleanup. :P
- move download source, checksum check/generate, and extract source into
functions, this should make it a little easier to follow the flow of the script.
Functions = good IMO, so go for it.
- remove clean cache, does it get used? I rather write a separate script
and put it in contrib/
Wait for now, although I personally agree I'm sure some use it.
- Remove '--usesudo', Always use sudo unless '--asroot' is passed.
I'll take care of this one, makes sense now.
- Remove '--log', Always create a build log.
Some people may not want logs cluttering their build area, so lets get some opinions.
- Remove '--nocolor', This depends on the new isatty in initscripts
I know a lot of scripts use it now, so wait for now.
-Dan
- replace the exit calls with a call to a clean up function eg
die() { local EXIT_CODE=$1; shift if [ $EXIT_CODE -gt 0 ]; then error "$@" fi
if [ RMDEPS && DEPS_INSTALLED ]; then remove_deps fi ... exit $EXIT_CODE}
Probably not a bad idea, although let's get some other opinions. die is an awfully harsh name, perhaps just cleanup. :P
But cleanup doesn't sound as eViL as die :p. I prefer something like do_exit, cleanup is a little misleading people reading the code need to know the script will exit after {die,cleanup,do_exit}.
- Remove '--log', Always create a build log.
Some people may not want logs cluttering their build area, so lets get some opinions.
- Remove '--nocolor', This depends on the new isatty in initscripts
I know a lot of scripts use it now, so wait for now.
The last 2 should have had a ? next to them. On second thoughts --log should stay. nocolor is dependent on the new isatty going into initscripts so it's a long term idea.
Andrew
2007/6/1, Andrew Fyfe andrew@neptune-one.net:
- replace the exit calls with a call to a clean up function eg
die() { local EXIT_CODE=$1; shift if [ $EXIT_CODE -gt 0 ]; then error "$@" fi
if [ RMDEPS && DEPS_INSTALLED ]; then remove_deps fi ... exit $EXIT_CODE}
Probably not a bad idea, although let's get some other opinions. die is an awfully harsh name, perhaps just cleanup. :P
But cleanup doesn't sound as eViL as die :p. I prefer something like do_exit, cleanup is a little misleading people reading the code need to know the script will exit after {die,cleanup,do_exit}.
+1 for do_exit (though I always use die in PHP :-P)
- Remove '--log', Always create a build log.
Some people may not want logs cluttering their build area, so lets get some opinions.
I'm surely will not be pleasured with any clutter, but that's not too critical to me.
- Remove '--nocolor', This depends on the new isatty in initscripts
I know a lot of scripts use it now, so wait for now.
The last 2 should have had a ? next to them. On second thoughts --log should stay. nocolor is dependent on the new isatty going into initscripts so it's a long term idea.
On 6/1/07, Andrew Fyfe andrew@neptune-one.net wrote:
- replace the exit calls with a call to a clean up function eg
die() { local EXIT_CODE=$1; shift if [ $EXIT_CODE -gt 0 ]; then error "$@" fi
if [ RMDEPS && DEPS_INSTALLED ]; then remove_deps fi ... exit $EXIT_CODE}
Probably not a bad idea, although let's get some other opinions. die is an awfully harsh name, perhaps just cleanup. :P
But cleanup doesn't sound as eViL as die :p. I prefer something like do_exit, cleanup is a little misleading people reading the code need to know the script will exit after {die,cleanup,do_exit}.
This is probably a good case for bash traps... you can set a bunch of traps on things like keyboard interrupt, termination, etc and call the cleanup function then. Try "help trap" at a bash prompt
Added a couple of patches to my makepkg branch,
- Dan's patch to switch from --sudo to --asroot - Move download source, check/generate checksums, and extract source into functions - And various cleanups.
Andrew
Dan McGee wrote:
On 6/1/07, Andrew Fyfe andrew@neptune-one.net wrote:
Oops, I was using working for something else, I've put the makepkg branch up, all the patches are there.
Andrew
While looking this over, I've noticed that we are calling exit an awful lot from the functions. Shouldn't we contain the exit calls to the main body of code, and use return statements to get the control back to there to do the actual exiting? Just a thought, comments welcome.
-Dan
pacman-dev mailing list pacman-dev@archlinux.org http://archlinux.org/mailman/listinfo/pacman-dev
Just for the record makepkg contains 54 :o exit calls
Andrew
On 6/1/07, Andrew Fyfe andrew@neptune-one.net wrote:
Dan McGee wrote:
On 5/30/07, Andrew Fyfe andrew@neptune-one.net wrote:
Dan McGee wrote:
On 3/24/07, Andrew Fyfe andrew@neptune-one.net wrote:
Another patch :)
This one targets the 3 dep check functions (handledeps, resolvedeps, removedeps). The bulk of the changes are whitespace and removing the repetitive if..then...else checks. Also some bits have been reordered to stop functions/external programs being called unnecessarily.
This still includes the fakeroot hacks, if you need it rediffed without the fakeroot hacks, I'll post a new patch.
Andrew
Cleaning out the email inbox...if this still applies and we haven't already done the cleanups, can you push it to your git tree?
-Dan
Yes, I'll apply this to my working branch and push it tonight.
Andrew
Andrew,
This one disappeared on me before I had a chance to look it over...any chance you still have it sitting around in a branch? If not, 'git lost-found' may be your friend, it may help you find it even if you thought you deleted it.
-Dan
Oops, I was using working for something else, I've put the makepkg branch up, all the patches are there.
Andrew
Yet another email on this thread...oh well. I just wanted to point out that I like the following notation: exit 1 # $E_MISSING_PROGRAM
I think having individual error codes defined may be a bit extreme, but having a notation why we are bailing out is a good idea at least in the code. I don't want to get too many of these codes, but things like missing program, bad PKGBUILD, build failure, missing deps, etc. are all good but not too-specific reasons. Perhaps you could submit a patch with a brief comment header containing these so people hacking on makepkg know what they have to choose from?
-Dan
Dan McGee wrote:
On 6/1/07, Andrew Fyfe andrew@neptune-one.net wrote:
Dan McGee wrote:
On 5/30/07, Andrew Fyfe andrew@neptune-one.net wrote:
Dan McGee wrote:
On 3/24/07, Andrew Fyfe andrew@neptune-one.net wrote:
Another patch :)
This one targets the 3 dep check functions (handledeps, resolvedeps, removedeps). The bulk of the changes are whitespace and removing the repetitive if..then...else checks. Also some bits have been reordered to stop functions/external programs being called unnecessarily.
This still includes the fakeroot hacks, if you need it rediffed without the fakeroot hacks, I'll post a new patch.
Andrew
Cleaning out the email inbox...if this still applies and we haven't already done the cleanups, can you push it to your git tree?
-Dan
Yes, I'll apply this to my working branch and push it tonight.
Andrew
Andrew,
This one disappeared on me before I had a chance to look it over...any chance you still have it sitting around in a branch? If not, 'git lost-found' may be your friend, it may help you find it even if you thought you deleted it.
-Dan
Oops, I was using working for something else, I've put the makepkg branch up, all the patches are there.
Andrew
Yet another email on this thread...oh well. I just wanted to point out that I like the following notation: exit 1 # $E_MISSING_PROGRAM
I think having individual error codes defined may be a bit extreme, but having a notation why we are bailing out is a good idea at least in the code. I don't want to get too many of these codes, but things like missing program, bad PKGBUILD, build failure, missing deps, etc. are all good but not too-specific reasons. Perhaps you could submit a patch with a brief comment header containing these so people hacking on makepkg know what they have to choose from?
-Dan
pacman-dev mailing list pacman-dev@archlinux.org http://archlinux.org/mailman/listinfo/pacman-dev
Sure, off the top of my head the original list I had was
$E_OK $E_UNKNOWN $E_BUILD_FAILURE $E_CONFIG_ERROR $E_MISSING_PROGRAM $E_USER_ABORT (yn_question() never went in so this isn't needed).
As far as error codes go as long as we keep 2 for build failures, everything else can use 1. Build failures are one thing people need to know about when using makepkg in a script so giving it it's own error code is a good idea.
I'll do up a patch with some description of the error codes.
Andrew
Dan McGee wrote:
On 3/24/07, Andrew Fyfe andrew@neptune-one.net wrote:
Another patch :)
This one targets the 3 dep check functions (handledeps, resolvedeps, removedeps). The bulk of the changes are whitespace and removing the repetitive if..then...else checks. Also some bits have been reordered to stop functions/external programs being called unnecessarily.
This still includes the fakeroot hacks, if you need it rediffed without the fakeroot hacks, I'll post a new patch.
Andrew
Cleaning out the email inbox...if this still applies and we haven't already done the cleanups, can you push it to your git tree?
-Dan
pacman-dev mailing list pacman-dev@archlinux.org http://archlinux.org/mailman/listinfo/pacman-dev
Ok I've pushed the patch onto my working branch, along with the clean up of scripts/abs.
Other branches: fakeroot: This contains the fake_install() patch, I know you don't want it in makepkg but I'm keeping it for the guys over at diy-linux.org, they might want it if the upgrade to pacman3.
xdelta: This contains Dale Ogilvie binary diff patch (http://bbs.archlinux.org/viewtopic.php?id=22872). I believe Aaron is looking into this.
Andrew
On 5/30/07, Andrew Fyfe andrew@neptune-one.net wrote:
Ok I've pushed the patch onto my working branch, along with the clean up of scripts/abs.
Cool, I'll take a look.
Other branches: fakeroot: This contains the fake_install() patch, I know you don't want it in makepkg but I'm keeping it for the guys over at diy-linux.org, they might want it if the upgrade to pacman3.
For now I'm leaving it out because it is a relatively significant change that I'm not sure we are ready for yet. Definitely keep it around, we may reconsider in the future.
xdelta: This contains Dale Ogilvie binary diff patch (http://bbs.archlinux.org/viewtopic.php?id=22872). I believe Aaron is looking into this.
It sounds like he will look into this in the coming days (maybe tonight), so you are correct here. Thanks for updating it to pacman 3.
I have a few other changes under my belt here as well, I should be pushing them to my repo and eventually the al.org tree.
-Dan
Dan McGee wrote:
On 5/30/07, Andrew Fyfe andrew@neptune-one.net wrote:
Ok I've pushed the patch onto my working branch, along with the clean up of scripts/abs.
Cool, I'll take a look.
Other branches: fakeroot: This contains the fake_install() patch, I know you don't want it in makepkg but I'm keeping it for the guys over at diy-linux.org, they might want it if the upgrade to pacman3.
For now I'm leaving it out because it is a relatively significant change that I'm not sure we are ready for yet. Definitely keep it around, we may reconsider in the future.
xdelta: This contains Dale Ogilvie binary diff patch (http://bbs.archlinux.org/viewtopic.php?id=22872). I believe Aaron is looking into this.
It sounds like he will look into this in the coming days (maybe tonight), so you are correct here. Thanks for updating it to pacman 3.
I have a few other changes under my belt here as well, I should be pushing them to my repo and eventually the al.org tree.
-Dan
pacman-dev mailing list pacman-dev@archlinux.org http://archlinux.org/mailman/listinfo/pacman-dev
Dan, There's also 3 new patches for makepkg from Dag Odenhall on flyspray, I've put the on my working branch with the other makepkg cleanup changes.
http://bugs.archlinux.org/task/7314 http://bugs.archlinux.org/task/7316 http://bugs.archlinux.org/task/7317
Andrew
On 5/30/07, Andrew Fyfe andrew@neptune-one.net wrote:
Dan McGee wrote:
On 5/30/07, Andrew Fyfe andrew@neptune-one.net wrote:
Ok I've pushed the patch onto my working branch, along with the clean up of scripts/abs.
Still on the back burner; not sure if we want to make all of these changes yet. I don't know if error codes are truely necessary in such a small script; I might take the spirit of your patch and do a simple cleanup of abs.
xdelta: This contains Dale Ogilvie binary diff patch (http://bbs.archlinux.org/viewtopic.php?id=22872). I believe Aaron is looking into this.
Aaron just pushed this tonight as well.
There's also 3 new patches for makepkg from Dag Odenhall on flyspray, I've put the on my working branch with the other makepkg cleanup changes.
http://bugs.archlinux.org/task/7314 http://bugs.archlinux.org/task/7316 http://bugs.archlinux.org/task/7317
I pulled all three of these to my tree (mostly cherry-picks) and made only minor modifications, but they are all there.
-Dan
pacman-dev@lists.archlinux.org