/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

Viewing changes to tools/packaging/update-packaging-branches.sh

  • Committer: Vincent Ladeuil
  • Date: 2009-04-27 16:10:10 UTC
  • mto: (4310.1.1 integration)
  • mto: This revision was merged to the branch mainline in revision 4311.
  • Revision ID: v.ladeuil+lp@free.fr-20090427161010-7swfzeagf63cpixd
Fix bug #367726 by reverting some default user handling introduced
while fixing bug #256612.

* bzrlib/transport/ssh.py:
(_paramiko_auth): Explicitly use getpass.getuser() as default
user.

* bzrlib/transport/ftp/_gssapi.py:
(GSSAPIFtpTransport._create_connection): Explicitly use
getpass.getuser() as default user.

* bzrlib/transport/ftp/__init__.py:
(FtpTransport._create_connection): Explicitly use
getpass.getuser() as default user.

* bzrlib/tests/test_sftp_transport.py:
(TestUsesAuthConfig.test_sftp_is_none_if_no_config)
(TestUsesAuthConfig.test_sftp_doesnt_prompt_username): Revert to
None as the default user.

* bzrlib/tests/test_remote.py:
(TestRemoteSSHTransportAuthentication): The really offending one:
revert to None as the default user.

* bzrlib/tests/test_config.py:
(TestAuthenticationConfig.test_username_default_no_prompt): Update
test (and some PEP8).

* bzrlib/smtp_connection.py:
(SMTPConnection._authenticate): Revert to None as the default
user.

* bzrlib/plugins/launchpad/account.py:
(_get_auth_user): Revert default value handling.

* bzrlib/config.py:
(AuthenticationConfig.get_user): Fix doc-string. Leave default
value handling to callers.

Show diffs side-by-side

added added

removed removed

Lines of Context:
tools/packaging/update-packaging-branches.sh
9
9
fi
10
10
 
11
11
for DISTRO in $UBUNTU_RELEASES; do
12
 
    if [ -d "$PACKAGE-$DISTRO" ] ; then
13
 
        echo "Updating $PACKAGE-$DISTRO"
14
 
        bzr update $PACKAGE-$DISTRO
15
 
        if [ "$PACKAGE" = "bzr-svn" ] ; then
16
 
            cd $PACKAGE-$DISTRO
17
 
            bzr merge http://bzr.debian.org/pkg-bazaar/bzr-svn/unstable/
18
 
            cd ..
19
 
        fi
 
12
    if [ -d "packaging-$DISTRO" ] ; then
 
13
        echo "Updating packaging-$DISTRO"
 
14
        bzr update packaging-$DISTRO
20
15
    else
21
 
        SRC="lp:~bzr/$PACKAGE/packaging-$DISTRO"
22
 
        if [ "$PACKAGE" = "bzr-svn" ] ; then
23
 
            SRC="lp:~bzr/$PACKAGE/beta-ppa-$DISTRO"
24
 
        fi
25
 
        echo "Checking out $SRC"
26
 
        bzr co $SRC $PACKAGE-$DISTRO
 
16
        echo "Checking out lp:~bzr/bzr/packaging-$DISTRO"
 
17
        bzr co lp:~bzr/bzr/packaging-$DISTRO
27
18
    fi
28
19
done
 
20