X-Git-Url: https://git.ozlabs.org/?a=blobdiff_plain;f=merge_akpm;h=ca55e9fd871202ebf873ae55500de75db6010dfa;hb=e2b1ad956622c4b4b6d98e412013e433411c7aac;hp=f3181dd0b6d1b87452de8a0480adc6eb63c27fb5;hpb=a1da89c3815d37ec96fc9f298560852b2231e853;p=next-scripts diff --git a/merge_akpm b/merge_akpm index f3181dd..ca55e9f 100755 --- a/merge_akpm +++ b/merge_akpm @@ -68,7 +68,7 @@ $no_build || echo git push failed 1>&2 bash -i || exit } - "$bin_dir/do_build" || { + "$bin_dir/do_build" akpm-current || { echo Build failed 1>&2 bash -i || exit } @@ -90,6 +90,7 @@ execute git rebase --onto master remotes/origin/akpm/master-base || { } echo "fix up?" notify-send "Waiting for akpm fix up" +pushover "Waiting for akpm fix up" bash -i log '$' cd $cpwd cd $cpwd @@ -127,7 +128,7 @@ $no_build || echo git push failed 1>&2 bash -i || exit } - "$bin_dir/do_build" || { + "$bin_dir/do_build" akpm || { echo Build failed 1>&2 bash -i || exit }