On Sun, Sep 4, 2011 at 9:20 PM, Chris Cormack <[email protected]>wrote:
> * Chris Nighswonger ([email protected]) wrote: > > This patch does not apply cleanly to 3.4.x. If it should, please > rebase > > against 3.4.x and resubmit with [3.4.x] in the subject line. > > > This patch depends on the patches for 6722 being applied first. > > I think its safe to apply them to the 3.4.x tree, then this one after > > Chris > > 6722 does not apply cleanly to 3.4.x either. I'm not sure where the divergence occurred. Perhaps I'm missing a still earlier commit? Chris > > > Kind Regards, > > Chris > > > > On Mon, Aug 15, 2011 at 1:19 AM, Robin Sheat <[email protected]> > > wrote: > > > > This allows the build information to not be suppressed when using > > build-git-snapshot. This makes seeing where problems are > substantially > > easier. > > --- > > A debian/build-git-snapshot | A A 9 ++++++++- > > A 1 files changed, 8 insertions(+), 1 deletions(-) > > > > diff --git a/debian/build-git-snapshot b/debian/build-git-snapshot > > index cd0545a..91552ff 100755 > > --- a/debian/build-git-snapshot > > +++ b/debian/build-git-snapshot > > @@ -58,6 +58,13 @@ sub sys_command_output { > > A A return map { chomp; $_ } <$command_output>; > > A } > > > > +sub sys_command_output_screen { > > + A A my ($command) = @_; > > + > > + A A print "$command\n" if $debug; > > + A A system($command); > > +} > > + > > A sub everything_is_committed { > > A A my $filter; > > A A for ($git_checks) { > > @@ -130,7 +137,7 @@ sub build_package { > > A A sys_command_output( qq{git archive --format=tar > > --prefix="koha-$newversion/" HEAD | gzip -9 > > > "../koha_$newversion.tar.gz"} ); > > > > A A my $pdebuildopts = $buildresult ? "--buildresult $buildresult" > : > > ""; > > - A A sys_command_output( "pdebuild $pdebuildopts" ); > > + A A sys_command_output_screen( "pdebuild $pdebuildopts" ); > > A } > > > > A everything_is_committed() or die "cannot build: uncommited > changes"; > > -- > > 1.7.4.1 > > > > _______________________________________________ > > Koha-patches mailing list > > [email protected] > > > http://lists.koha-community.org/cgi-bin/mailman/listinfo/koha-patches > > website : http://www.koha-community.org/ > > git : http://git.koha-community.org/ > > bugs : http://bugs.koha-community.org/ > > > _______________________________________________ > > Koha-patches mailing list > > [email protected] > > http://lists.koha-community.org/cgi-bin/mailman/listinfo/koha-patches > > website : http://www.koha-community.org/ > > git : http://git.koha-community.org/ > > bugs : http://bugs.koha-community.org/ > > > -- > Chris Cormack > Catalyst IT Ltd. > +64 4 803 2238 > PO Box 11-053, Manners St, Wellington 6142, New Zealand >
_______________________________________________ Koha-patches mailing list [email protected] http://lists.koha-community.org/cgi-bin/mailman/listinfo/koha-patches website : http://www.koha-community.org/ git : http://git.koha-community.org/ bugs : http://bugs.koha-community.org/
