/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-05-04 14:48:21 UTC
  • mto: (4349.1.1 integration)
  • mto: This revision was merged to the branch mainline in revision 4350.
  • Revision ID: v.ladeuil+lp@free.fr-20090504144821-39dvqkikmd3zqkdg
Handle servers proposing several authentication schemes.

* bzrlib/transport/http/_urllib2_wrappers.py:
(AbstractAuthHandler.auth_required): Several schemes can be
proposed by the server, try to match each one in turn.
(BasicAuthHandler.auth_match): Delete dead code.

* bzrlib/tests/test_http.py:
(load_tests): Separate proxy and http authentication tests as they
require different server setups.
(TestAuth.create_transport_readonly_server): Simplified by using
parameter provided by load_tests.
(TestAuth.test_changing_nonce): Adapt to new parametrization.
(TestProxyAuth.create_transport_readonly_server): Deleted.

* bzrlib/tests/http_utils.py:
(DigestAndBasicAuthRequestHandler, HTTPBasicAndDigestAuthServer,
ProxyBasicAndDigestAuthServer): Add a test server proposing both
basic and digest auth schemes but accepting only digest as valid.

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