/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-control.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-control.sh
1
 
#!/bin/bash
2
 
 
3
 
if [ -z "$UBUNTU_RELEASES" ]; then
4
 
    echo "Configure the distro platforms that you want to"
5
 
    echo "build with a line like:"
6
 
    echo '  export UBUNTU_RELEASES="dapper feisty gutsy hardy intrepid jaunty"'
7
 
    exit 1
8
 
fi
9
 
 
10
 
OLD_VERSION=$1
11
 
NEW_VERSION=$2
12
 
NEXT_VERSION=$3
13
 
if [ -z "$OLD_VERSION" -o -z "$NEW_VERSION" -o -z "$NEXT_VERSION" ]; then
14
 
    echo "Missing version"
15
 
    echo "You want something like:"
16
 
    echo "  update-control.sh 1.5 1.6 1.7"
17
 
    exit
18
 
fi
19
 
 
20
 
if [ "$PACKAGE" = "bzr" ]; then
21
 
    continue
22
 
fi
23
 
for DISTRO in $UBUNTU_RELEASES; do
24
 
    PPAVERSION="$VERSION~${DISTRO}1"
25
 
    (
26
 
        echo "Updating control for $DISTRO"
27
 
        cd "$PACKAGE-$DISTRO" &&
28
 
            sed -i -e "s/$NEW_VERSION~/$NEXT_VERSION~/;s/$OLD_VERSION~/$NEW_VERSION~/" control &&
29
 
            bzr commit -m "New upstream release: $PPAVERSION, update control"
30
 
    )
31
 
done