lp:~mterry/duplicity/pexpect-fix

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp:duplicity/0.6 at revision 962

duplicity-team: Pending requested 2014-02-22

Diff: 18 lines (+1/-1)

1 file modified

testing/tests/finaltest.py (+1/-1)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

962. By Michael Terry on 2014-02-22

Fix pexpect import

961. By Kenneth Loafman on 2014-02-05

    * Merged in lp:~mterry/duplicity/gpg-encode
      - getpass.getpass(prompt) eventually calls str(prompt). Which is a no go,
        if the prompt contains unicode. Here's a patch to always pass getpass() a
        byte string.
      - Our tests didn't catch this because they always set PASSPHRASE. I've added
        a test that passes the passphrase via stdin.

960. By Kenneth Loafman on 2014-01-31

* Applied two patches from mailing list message at:
  https://lists.nongnu.org/archive/html/duplicity-talk/2014-01/msg00030.html
  "Added command line options to use different prefixes for manifest/sig/archive files"
  This resolves https://bugs.launchpad.net/duplicity/+bug/1170161 and provides
  a workaround for https://bugs.launchpad.net/duplicity/+bug/1170113

959. By Kenneth Loafman on 2014-01-24

Update to translations.

958. By Kenneth Loafman on 2014-01-24

* Prep for 0.6.23 release.

957. By Kenneth Loafman on 2014-01-24

* Prep for 0.6.23 release.

956. By Kenneth Loafman on 2014-01-21

* Merged in lp:~mterry/duplicity/argv-encode
  - Use the system filename encoding to print the args in unicode.

955. By Kenneth Loafman on 2014-01-21

* Merged in lp:~louis-bouchard/duplicity/remove-allow-concurrency
  - remove the --allow-concurrency switch but leave the lock

954. By Kenneth Loafman on 2014-01-20

Merged in lp:~louis-bouchard/duplicity/allow-concurrency-manpage

953. By Kenneth Loafman on 2014-01-17

* Merged in lp:~louis-bouchard/duplicity/add-allow-concurrency
  - Implement locking mechanism to avoid concurrent execution under the same
    cache directory. This is the default behavior.
  - Also implement --alllow-concurrency option to disable the locking
    if required.
  - This functionality adds a dependency to python-lockfile