Dont mess with global user identity in __scm_setup_bzr

- Bzr defaults to global value on "bzr whoami", so we would mess
  up user identity on "%autosetup -S bzr". Oops. Move identity setting
  after repo initialization and set the identity per-branch, not global.
  The notion of "per-branch identity" seems odd, but then bzr is...
  I guess this would be bzr-speak for "per-directory identity"
(cherry picked from commit 58f41cb4e1721d410017732a55613056b6acb24c)

diff --git a/macros.in b/macros.in
index 319be283a97de98c2f11aecf9aec207d9c6bf49c..cd7bc31991c0ddbab651dd1c5f7716b626b7b940 100644 (file)
--- a/macros.in
+++ b/macros.in
@@ -1074,8 +1074,8 @@ done \
 
 # Bzr
 %__scm_setup_bzr(q)\
-%{__bzr} whoami "%{__scm_author}"\
 %{__bzr} init %{-q}\
+%{__bzr} whoami --branch "%{__scm_author}"\
 %{__bzr} add .\
 %{__bzr} commit %{-q} -m "%{name}-%{version} base"