[open-ils-commits] [GIT] Evergreen ILS branch master updated. 8bb24e67e89c016dfc7d3d0c0c717da3e46fdbad

[Evergreen Git]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Evergreen ILS".

The branch, master has been updated
       via  8bb24e67e89c016dfc7d3d0c0c717da3e46fdbad (commit)
       via  044f1f18ca74bf400646f106ee065c663654e697 (commit)
      from  b67ebdb624479fdce8196465b451df14b9ac4f4d (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 8bb24e67e89c016dfc7d3d0c0c717da3e46fdbad
Merge: 044f1f1 b67ebdb
Author: Dan Scott <dan at coffeecode.net>
Date:   Tue May 24 22:49:44 2011 -0400

    Merge branch 'master' of git.evergreen-ils.org:working/Evergreen into user/dbs/foo13498-29838-ws


commit 044f1f18ca74bf400646f106ee065c663654e697
Author: Thomas Berezansky <tsbere at mvlc.org>
Date:   Tue May 24 22:20:20 2011 -0400

    When auto-versioning, use last piece of branch
    
    Specifically, last / delimited piece.
    
    Signed-off-by: Thomas Berezansky <tsbere at mvlc.org>
    Signed-off-by: Dan Scott <dan at coffeecode.net>

diff --git a/Open-ILS/xul/staff_client/Makefile.am b/Open-ILS/xul/staff_client/Makefile.am
index d210ef2..318329d 100644
--- a/Open-ILS/xul/staff_client/Makefile.am
+++ b/Open-ILS/xul/staff_client/Makefile.am
@@ -19,7 +19,7 @@ CHROME_LOCALES = $$(ls -1 chrome/locale)
 SKIN_CSS = $$(ls -1 server/skin/*css | sed -e "s/.css/_custom.css/")
 UPDATESDIR=@localstatedir@/updates
 
-GIT_BRANCH=$$(git rev-parse --abbrev-ref HEAD || echo master)
+GIT_BRANCH=$$(echo $$(git rev-parse --abbrev-ref HEAD || echo master) | sed 's|.*/||')
 GIT_TAG=$$(git rev-parse --short HEAD) # For auto-tagging builds
 
 export NSIS_EXTRAOPTS

-----------------------------------------------------------------------

Summary of changes:
 Open-ILS/xul/staff_client/Makefile.am |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)


hooks/post-receive
-- 
Evergreen ILS