[arch-commits] Commit in deja-dup/repos (16 files)
Balló György
bgyorgy at nymeria.archlinux.org
Tue Mar 5 09:07:45 UTC 2013
Date: Tuesday, March 5, 2013 @ 10:07:44
Author: bgyorgy
Revision: 85692
archrelease: copy trunk to community-i686, community-x86_64
Added:
deja-dup/repos/community-i686/PKGBUILD
(from rev 85691, deja-dup/trunk/PKGBUILD)
deja-dup/repos/community-i686/deja-dup.install
(from rev 85691, deja-dup/trunk/deja-dup.install)
deja-dup/repos/community-i686/new-u1backend-support.patch
(from rev 85691, deja-dup/trunk/new-u1backend-support.patch)
deja-dup/repos/community-i686/update-u1-pythonchecker.patch
(from rev 85691, deja-dup/trunk/update-u1-pythonchecker.patch)
deja-dup/repos/community-x86_64/PKGBUILD
(from rev 85691, deja-dup/trunk/PKGBUILD)
deja-dup/repos/community-x86_64/deja-dup.install
(from rev 85691, deja-dup/trunk/deja-dup.install)
deja-dup/repos/community-x86_64/new-u1backend-support.patch
(from rev 85691, deja-dup/trunk/new-u1backend-support.patch)
deja-dup/repos/community-x86_64/update-u1-pythonchecker.patch
(from rev 85691, deja-dup/trunk/update-u1-pythonchecker.patch)
Deleted:
deja-dup/repos/community-i686/PKGBUILD
deja-dup/repos/community-i686/deja-dup.install
deja-dup/repos/community-i686/new-u1backend-support.patch
deja-dup/repos/community-i686/not-check-ubuntuone-couch.patch
deja-dup/repos/community-x86_64/PKGBUILD
deja-dup/repos/community-x86_64/deja-dup.install
deja-dup/repos/community-x86_64/new-u1backend-support.patch
deja-dup/repos/community-x86_64/not-check-ubuntuone-couch.patch
--------------------------------------------------+
community-i686/PKGBUILD | 88 +++++++++---------
community-i686/deja-dup.install | 24 ++---
community-i686/new-u1backend-support.patch | 100 ++++++++++-----------
community-i686/not-check-ubuntuone-couch.patch | 45 ---------
community-i686/update-u1-pythonchecker.patch | 13 ++
community-x86_64/PKGBUILD | 88 +++++++++---------
community-x86_64/deja-dup.install | 24 ++---
community-x86_64/new-u1backend-support.patch | 100 ++++++++++-----------
community-x86_64/not-check-ubuntuone-couch.patch | 45 ---------
community-x86_64/update-u1-pythonchecker.patch | 13 ++
10 files changed, 240 insertions(+), 300 deletions(-)
Deleted: community-i686/PKGBUILD
===================================================================
--- community-i686/PKGBUILD 2013-03-05 09:07:34 UTC (rev 85691)
+++ community-i686/PKGBUILD 2013-03-05 09:07:44 UTC (rev 85692)
@@ -1,43 +0,0 @@
-# $Id$
-# Maintainer: Balló György <ballogyor+arch at gmail dot com>
-
-pkgname=deja-dup
-pkgver=24.0
-pkgrel=2
-pkgdesc="Simple backup tool, that hides the complexity of backing up the Right Way and uses duplicity as the backend"
-arch=('i686' 'x86_64')
-url="https://launchpad.net/deja-dup"
-license=('GPL')
-depends=('duplicity' 'libgnome-keyring' 'libpeas' 'libnotify' 'python2-gobject2' 'dconf' 'xdg-utils')
-makedepends=('vala' 'intltool' 'itstool' 'nautilus')
-optdepends=('nautilus: backup extension'
- 'ubuntuone-client: backup into Ubuntu One storage')
-options=('!libtool')
-install=$pkgname.install
-source=(http://launchpad.net/$pkgname/${pkgver%.*}/$pkgver/+download/$pkgname-$pkgver.tar.xz
- new-u1backend-support.patch
- not-check-ubuntuone-couch.patch)
-md5sums=('335131d1f3c85615339fa8b212db50ae'
- '944a4c62f042b240feba98f8d9a893b2'
- '8d59798638982c2bdb55b2e415087245')
-
-build() {
- cd "$srcdir/$pkgname-$pkgver"
- sed -i 's/\"python\", \"-c\"/\"python2\", \"-c\"/' common/PythonChecker.vala
-
- # Add support for the new Ubuntu One backend
- patch -Np0 -i "$srcdir/new-u1backend-support.patch"
-
- # Now we don't need ubuntuone-couch for Ubuntu One support
- patch -Np1 -i "$srcdir/not-check-ubuntuone-couch.patch"
-
- ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var --libexecdir=/usr/lib/$pkgname \
- --disable-static --disable-schemas-compile --without-unity
- make
-}
-
-package() {
- cd "$srcdir/$pkgname-$pkgver"
-
- make DESTDIR="$pkgdir/" install
-}
Copied: deja-dup/repos/community-i686/PKGBUILD (from rev 85691, deja-dup/trunk/PKGBUILD)
===================================================================
--- community-i686/PKGBUILD (rev 0)
+++ community-i686/PKGBUILD 2013-03-05 09:07:44 UTC (rev 85692)
@@ -0,0 +1,45 @@
+# $Id$
+# Maintainer: Balló György <ballogyor+arch at gmail dot com>
+
+pkgname=deja-dup
+pkgver=24.0
+pkgrel=3
+pkgdesc="Simple backup tool, that hides the complexity of backing up the Right Way and uses duplicity as the backend"
+arch=('i686' 'x86_64')
+url="https://launchpad.net/deja-dup"
+license=('GPL')
+depends=('duplicity' 'libgnome-keyring' 'libpeas' 'libnotify' 'python2-gobject' 'gvfs' 'dconf' 'xdg-utils')
+makedepends=('vala' 'intltool' 'itstool' 'nautilus')
+optdepends=('nautilus: backup extension'
+ 'python2-boto: Amazon S3 backend'
+ 'python2-oauthlib: Ubuntu One backend'
+ 'ubuntuone-client: Ubuntu One backend')
+options=('!libtool')
+install=$pkgname.install
+source=(http://launchpad.net/$pkgname/${pkgver%.*}/$pkgver/+download/$pkgname-$pkgver.tar.xz
+ new-u1backend-support.patch
+ update-u1-pythonchecker.patch)
+md5sums=('335131d1f3c85615339fa8b212db50ae'
+ '944a4c62f042b240feba98f8d9a893b2'
+ 'd0893c17e3e61c3ada065a002a9ab419')
+
+build() {
+ cd "$srcdir/$pkgname-$pkgver"
+ sed -i 's/\"python\", \"-c\"/\"python2\", \"-c\"/' common/PythonChecker.vala
+
+ # Add support for the new Ubuntu One backend
+ patch -Np0 -i "$srcdir/new-u1backend-support.patch"
+
+ # And update the PythonChecker check for the new U1 backend too
+ patch -Np0 -i "$srcdir/update-u1-pythonchecker.patch"
+
+ ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var --libexecdir=/usr/lib/$pkgname \
+ --disable-static --disable-schemas-compile --without-unity
+ make
+}
+
+package() {
+ cd "$srcdir/$pkgname-$pkgver"
+
+ make DESTDIR="$pkgdir/" install
+}
Deleted: community-i686/deja-dup.install
===================================================================
--- community-i686/deja-dup.install 2013-03-05 09:07:34 UTC (rev 85691)
+++ community-i686/deja-dup.install 2013-03-05 09:07:44 UTC (rev 85692)
@@ -1,12 +0,0 @@
-post_install() {
- glib-compile-schemas usr/share/glib-2.0/schemas
- xdg-icon-resource forceupdate
-}
-
-post_upgrade() {
- post_install $1
-}
-
-post_remove() {
- post_install $1
-}
Copied: deja-dup/repos/community-i686/deja-dup.install (from rev 85691, deja-dup/trunk/deja-dup.install)
===================================================================
--- community-i686/deja-dup.install (rev 0)
+++ community-i686/deja-dup.install 2013-03-05 09:07:44 UTC (rev 85692)
@@ -0,0 +1,12 @@
+post_install() {
+ glib-compile-schemas usr/share/glib-2.0/schemas
+ xdg-icon-resource forceupdate
+}
+
+post_upgrade() {
+ post_install $1
+}
+
+post_remove() {
+ post_install $1
+}
Deleted: community-i686/new-u1backend-support.patch
===================================================================
--- community-i686/new-u1backend-support.patch 2013-03-05 09:07:34 UTC (rev 85691)
+++ community-i686/new-u1backend-support.patch 2013-03-05 09:07:44 UTC (rev 85692)
@@ -1,50 +0,0 @@
-=== modified file 'common/BackendU1.vala'
---- common/BackendU1.vala 2012-08-06 22:41:13 +0000
-+++ common/BackendU1.vala 2012-11-03 21:35:53 +0000
-@@ -212,21 +212,41 @@
-
- public override async void get_envp() throws Error
- {
-- bool found = false;
- var obj = get_creds_proxy();
- if (obj.get_name_owner() == null) {
- ask_password();
- return;
- }
-
-+ var found = false;
-+ var envp = new List<string>();
- var listener = new Listener(obj, "find_credentials", null, (name, args) => {
-- if (name == "CredentialsFound")
-- found = true;
-+ if (name == "CredentialsFound") {
-+ VariantIter iter;
-+ args.get("(a{ss})", out iter);
-+ string key, val;
-+ string consumer_key = null, consumer_secret = null, token = null, token_secret = null;
-+ while (iter.next("{ss}", out key, out val)) {
-+ if (key == "consumer_key")
-+ consumer_key = val;
-+ else if (key == "consumer_secret")
-+ consumer_secret = val;
-+ else if (key == "token")
-+ token = val;
-+ else if (key == "token_secret")
-+ token_secret = val;
-+ }
-+ if (consumer_key != null && consumer_secret != null && token != null && token_secret != null) {
-+ warning("appending: %s", "FTP_PASSWORD=%s:%s:%s:%s".printf(consumer_key, consumer_secret, token, token_secret));
-+ envp.append("FTP_PASSWORD=%s:%s:%s:%s".printf(consumer_key, consumer_secret, token, token_secret));
-+ found = true;
-+ }
-+ }
- });
- listener.run();
-
- if (found)
-- envp_ready(true, null);
-+ envp_ready(true, envp);
- else
- ask_password();
- }
-
Copied: deja-dup/repos/community-i686/new-u1backend-support.patch (from rev 85691, deja-dup/trunk/new-u1backend-support.patch)
===================================================================
--- community-i686/new-u1backend-support.patch (rev 0)
+++ community-i686/new-u1backend-support.patch 2013-03-05 09:07:44 UTC (rev 85692)
@@ -0,0 +1,50 @@
+=== modified file 'common/BackendU1.vala'
+--- common/BackendU1.vala 2012-08-06 22:41:13 +0000
++++ common/BackendU1.vala 2012-11-03 21:35:53 +0000
+@@ -212,21 +212,41 @@
+
+ public override async void get_envp() throws Error
+ {
+- bool found = false;
+ var obj = get_creds_proxy();
+ if (obj.get_name_owner() == null) {
+ ask_password();
+ return;
+ }
+
++ var found = false;
++ var envp = new List<string>();
+ var listener = new Listener(obj, "find_credentials", null, (name, args) => {
+- if (name == "CredentialsFound")
+- found = true;
++ if (name == "CredentialsFound") {
++ VariantIter iter;
++ args.get("(a{ss})", out iter);
++ string key, val;
++ string consumer_key = null, consumer_secret = null, token = null, token_secret = null;
++ while (iter.next("{ss}", out key, out val)) {
++ if (key == "consumer_key")
++ consumer_key = val;
++ else if (key == "consumer_secret")
++ consumer_secret = val;
++ else if (key == "token")
++ token = val;
++ else if (key == "token_secret")
++ token_secret = val;
++ }
++ if (consumer_key != null && consumer_secret != null && token != null && token_secret != null) {
++ warning("appending: %s", "FTP_PASSWORD=%s:%s:%s:%s".printf(consumer_key, consumer_secret, token, token_secret));
++ envp.append("FTP_PASSWORD=%s:%s:%s:%s".printf(consumer_key, consumer_secret, token, token_secret));
++ found = true;
++ }
++ }
+ });
+ listener.run();
+
+ if (found)
+- envp_ready(true, null);
++ envp_ready(true, envp);
+ else
+ ask_password();
+ }
+
Deleted: community-i686/not-check-ubuntuone-couch.patch
===================================================================
--- community-i686/not-check-ubuntuone-couch.patch 2013-03-05 09:07:34 UTC (rev 85691)
+++ community-i686/not-check-ubuntuone-couch.patch 2013-03-05 09:07:44 UTC (rev 85692)
@@ -1,45 +0,0 @@
-diff -Naur deja-dup-24.0.orig/common/BackendU1.vala deja-dup-24.0/common/BackendU1.vala
---- deja-dup-24.0.orig/common/BackendU1.vala 2012-08-07 00:20:51.000000000 +0200
-+++ deja-dup-24.0/common/BackendU1.vala 2012-11-05 16:39:34.140104977 +0100
-@@ -75,11 +75,14 @@
-
- class U1Checker : Checker
- {
-- PythonChecker pyu1;
- construct {
- try {
- var proxy = BackendU1.get_creds_proxy();
-- if (proxy.get_name_owner() == null) {
-+ if (proxy.get_name_owner() != null) {
-+ available = true;
-+ complete = true;
-+ }
-+ else {
- available = false;
- complete = true;
- }
-@@ -89,24 +92,6 @@
- available = false;
- complete = true;
- }
--
-- if (!complete) {
-- // A bit of abstraction leakage here; we have to keep these imports in
-- // line with what duplicity uses. Maybe we should add to duplicity a way
-- // to ask 'can I use this backend?'
-- pyu1 = PythonChecker.get_checker("ubuntuone.platform.credentials, ubuntuone.couch.auth");
-- if (pyu1.complete) {
-- available = pyu1.available;
-- complete = pyu1.complete;
-- }
-- else {
-- pyu1.notify["complete"].connect(() => {
-- available = pyu1.available;
-- complete = pyu1.complete;
-- pyu1 = null;
-- });
-- }
-- }
- }
- }
-
Copied: deja-dup/repos/community-i686/update-u1-pythonchecker.patch (from rev 85691, deja-dup/trunk/update-u1-pythonchecker.patch)
===================================================================
--- community-i686/update-u1-pythonchecker.patch (rev 0)
+++ community-i686/update-u1-pythonchecker.patch 2013-03-05 09:07:44 UTC (rev 85692)
@@ -0,0 +1,13 @@
+=== modified file 'common/BackendU1.vala'
+--- common/BackendU1.vala 2012-11-05 15:10:54 +0000
++++ common/BackendU1.vala 2012-11-05 15:17:28 +0000
+@@ -94,7 +94,7 @@
+ // A bit of abstraction leakage here; we have to keep these imports in
+ // line with what duplicity uses. Maybe we should add to duplicity a way
+ // to ask 'can I use this backend?'
+- pyu1 = PythonChecker.get_checker("ubuntuone.platform.credentials, ubuntuone.couch.auth");
++ pyu1 = PythonChecker.get_checker("oauthlib, httplib2");
+ if (pyu1.complete) {
+ available = pyu1.available;
+ complete = pyu1.complete;
+
Deleted: community-x86_64/PKGBUILD
===================================================================
--- community-x86_64/PKGBUILD 2013-03-05 09:07:34 UTC (rev 85691)
+++ community-x86_64/PKGBUILD 2013-03-05 09:07:44 UTC (rev 85692)
@@ -1,43 +0,0 @@
-# $Id$
-# Maintainer: Balló György <ballogyor+arch at gmail dot com>
-
-pkgname=deja-dup
-pkgver=24.0
-pkgrel=2
-pkgdesc="Simple backup tool, that hides the complexity of backing up the Right Way and uses duplicity as the backend"
-arch=('i686' 'x86_64')
-url="https://launchpad.net/deja-dup"
-license=('GPL')
-depends=('duplicity' 'libgnome-keyring' 'libpeas' 'libnotify' 'python2-gobject2' 'dconf' 'xdg-utils')
-makedepends=('vala' 'intltool' 'itstool' 'nautilus')
-optdepends=('nautilus: backup extension'
- 'ubuntuone-client: backup into Ubuntu One storage')
-options=('!libtool')
-install=$pkgname.install
-source=(http://launchpad.net/$pkgname/${pkgver%.*}/$pkgver/+download/$pkgname-$pkgver.tar.xz
- new-u1backend-support.patch
- not-check-ubuntuone-couch.patch)
-md5sums=('335131d1f3c85615339fa8b212db50ae'
- '944a4c62f042b240feba98f8d9a893b2'
- '8d59798638982c2bdb55b2e415087245')
-
-build() {
- cd "$srcdir/$pkgname-$pkgver"
- sed -i 's/\"python\", \"-c\"/\"python2\", \"-c\"/' common/PythonChecker.vala
-
- # Add support for the new Ubuntu One backend
- patch -Np0 -i "$srcdir/new-u1backend-support.patch"
-
- # Now we don't need ubuntuone-couch for Ubuntu One support
- patch -Np1 -i "$srcdir/not-check-ubuntuone-couch.patch"
-
- ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var --libexecdir=/usr/lib/$pkgname \
- --disable-static --disable-schemas-compile --without-unity
- make
-}
-
-package() {
- cd "$srcdir/$pkgname-$pkgver"
-
- make DESTDIR="$pkgdir/" install
-}
Copied: deja-dup/repos/community-x86_64/PKGBUILD (from rev 85691, deja-dup/trunk/PKGBUILD)
===================================================================
--- community-x86_64/PKGBUILD (rev 0)
+++ community-x86_64/PKGBUILD 2013-03-05 09:07:44 UTC (rev 85692)
@@ -0,0 +1,45 @@
+# $Id$
+# Maintainer: Balló György <ballogyor+arch at gmail dot com>
+
+pkgname=deja-dup
+pkgver=24.0
+pkgrel=3
+pkgdesc="Simple backup tool, that hides the complexity of backing up the Right Way and uses duplicity as the backend"
+arch=('i686' 'x86_64')
+url="https://launchpad.net/deja-dup"
+license=('GPL')
+depends=('duplicity' 'libgnome-keyring' 'libpeas' 'libnotify' 'python2-gobject' 'gvfs' 'dconf' 'xdg-utils')
+makedepends=('vala' 'intltool' 'itstool' 'nautilus')
+optdepends=('nautilus: backup extension'
+ 'python2-boto: Amazon S3 backend'
+ 'python2-oauthlib: Ubuntu One backend'
+ 'ubuntuone-client: Ubuntu One backend')
+options=('!libtool')
+install=$pkgname.install
+source=(http://launchpad.net/$pkgname/${pkgver%.*}/$pkgver/+download/$pkgname-$pkgver.tar.xz
+ new-u1backend-support.patch
+ update-u1-pythonchecker.patch)
+md5sums=('335131d1f3c85615339fa8b212db50ae'
+ '944a4c62f042b240feba98f8d9a893b2'
+ 'd0893c17e3e61c3ada065a002a9ab419')
+
+build() {
+ cd "$srcdir/$pkgname-$pkgver"
+ sed -i 's/\"python\", \"-c\"/\"python2\", \"-c\"/' common/PythonChecker.vala
+
+ # Add support for the new Ubuntu One backend
+ patch -Np0 -i "$srcdir/new-u1backend-support.patch"
+
+ # And update the PythonChecker check for the new U1 backend too
+ patch -Np0 -i "$srcdir/update-u1-pythonchecker.patch"
+
+ ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var --libexecdir=/usr/lib/$pkgname \
+ --disable-static --disable-schemas-compile --without-unity
+ make
+}
+
+package() {
+ cd "$srcdir/$pkgname-$pkgver"
+
+ make DESTDIR="$pkgdir/" install
+}
Deleted: community-x86_64/deja-dup.install
===================================================================
--- community-x86_64/deja-dup.install 2013-03-05 09:07:34 UTC (rev 85691)
+++ community-x86_64/deja-dup.install 2013-03-05 09:07:44 UTC (rev 85692)
@@ -1,12 +0,0 @@
-post_install() {
- glib-compile-schemas usr/share/glib-2.0/schemas
- xdg-icon-resource forceupdate
-}
-
-post_upgrade() {
- post_install $1
-}
-
-post_remove() {
- post_install $1
-}
Copied: deja-dup/repos/community-x86_64/deja-dup.install (from rev 85691, deja-dup/trunk/deja-dup.install)
===================================================================
--- community-x86_64/deja-dup.install (rev 0)
+++ community-x86_64/deja-dup.install 2013-03-05 09:07:44 UTC (rev 85692)
@@ -0,0 +1,12 @@
+post_install() {
+ glib-compile-schemas usr/share/glib-2.0/schemas
+ xdg-icon-resource forceupdate
+}
+
+post_upgrade() {
+ post_install $1
+}
+
+post_remove() {
+ post_install $1
+}
Deleted: community-x86_64/new-u1backend-support.patch
===================================================================
--- community-x86_64/new-u1backend-support.patch 2013-03-05 09:07:34 UTC (rev 85691)
+++ community-x86_64/new-u1backend-support.patch 2013-03-05 09:07:44 UTC (rev 85692)
@@ -1,50 +0,0 @@
-=== modified file 'common/BackendU1.vala'
---- common/BackendU1.vala 2012-08-06 22:41:13 +0000
-+++ common/BackendU1.vala 2012-11-03 21:35:53 +0000
-@@ -212,21 +212,41 @@
-
- public override async void get_envp() throws Error
- {
-- bool found = false;
- var obj = get_creds_proxy();
- if (obj.get_name_owner() == null) {
- ask_password();
- return;
- }
-
-+ var found = false;
-+ var envp = new List<string>();
- var listener = new Listener(obj, "find_credentials", null, (name, args) => {
-- if (name == "CredentialsFound")
-- found = true;
-+ if (name == "CredentialsFound") {
-+ VariantIter iter;
-+ args.get("(a{ss})", out iter);
-+ string key, val;
-+ string consumer_key = null, consumer_secret = null, token = null, token_secret = null;
-+ while (iter.next("{ss}", out key, out val)) {
-+ if (key == "consumer_key")
-+ consumer_key = val;
-+ else if (key == "consumer_secret")
-+ consumer_secret = val;
-+ else if (key == "token")
-+ token = val;
-+ else if (key == "token_secret")
-+ token_secret = val;
-+ }
-+ if (consumer_key != null && consumer_secret != null && token != null && token_secret != null) {
-+ warning("appending: %s", "FTP_PASSWORD=%s:%s:%s:%s".printf(consumer_key, consumer_secret, token, token_secret));
-+ envp.append("FTP_PASSWORD=%s:%s:%s:%s".printf(consumer_key, consumer_secret, token, token_secret));
-+ found = true;
-+ }
-+ }
- });
- listener.run();
-
- if (found)
-- envp_ready(true, null);
-+ envp_ready(true, envp);
- else
- ask_password();
- }
-
Copied: deja-dup/repos/community-x86_64/new-u1backend-support.patch (from rev 85691, deja-dup/trunk/new-u1backend-support.patch)
===================================================================
--- community-x86_64/new-u1backend-support.patch (rev 0)
+++ community-x86_64/new-u1backend-support.patch 2013-03-05 09:07:44 UTC (rev 85692)
@@ -0,0 +1,50 @@
+=== modified file 'common/BackendU1.vala'
+--- common/BackendU1.vala 2012-08-06 22:41:13 +0000
++++ common/BackendU1.vala 2012-11-03 21:35:53 +0000
+@@ -212,21 +212,41 @@
+
+ public override async void get_envp() throws Error
+ {
+- bool found = false;
+ var obj = get_creds_proxy();
+ if (obj.get_name_owner() == null) {
+ ask_password();
+ return;
+ }
+
++ var found = false;
++ var envp = new List<string>();
+ var listener = new Listener(obj, "find_credentials", null, (name, args) => {
+- if (name == "CredentialsFound")
+- found = true;
++ if (name == "CredentialsFound") {
++ VariantIter iter;
++ args.get("(a{ss})", out iter);
++ string key, val;
++ string consumer_key = null, consumer_secret = null, token = null, token_secret = null;
++ while (iter.next("{ss}", out key, out val)) {
++ if (key == "consumer_key")
++ consumer_key = val;
++ else if (key == "consumer_secret")
++ consumer_secret = val;
++ else if (key == "token")
++ token = val;
++ else if (key == "token_secret")
++ token_secret = val;
++ }
++ if (consumer_key != null && consumer_secret != null && token != null && token_secret != null) {
++ warning("appending: %s", "FTP_PASSWORD=%s:%s:%s:%s".printf(consumer_key, consumer_secret, token, token_secret));
++ envp.append("FTP_PASSWORD=%s:%s:%s:%s".printf(consumer_key, consumer_secret, token, token_secret));
++ found = true;
++ }
++ }
+ });
+ listener.run();
+
+ if (found)
+- envp_ready(true, null);
++ envp_ready(true, envp);
+ else
+ ask_password();
+ }
+
Deleted: community-x86_64/not-check-ubuntuone-couch.patch
===================================================================
--- community-x86_64/not-check-ubuntuone-couch.patch 2013-03-05 09:07:34 UTC (rev 85691)
+++ community-x86_64/not-check-ubuntuone-couch.patch 2013-03-05 09:07:44 UTC (rev 85692)
@@ -1,45 +0,0 @@
-diff -Naur deja-dup-24.0.orig/common/BackendU1.vala deja-dup-24.0/common/BackendU1.vala
---- deja-dup-24.0.orig/common/BackendU1.vala 2012-08-07 00:20:51.000000000 +0200
-+++ deja-dup-24.0/common/BackendU1.vala 2012-11-05 16:39:34.140104977 +0100
-@@ -75,11 +75,14 @@
-
- class U1Checker : Checker
- {
-- PythonChecker pyu1;
- construct {
- try {
- var proxy = BackendU1.get_creds_proxy();
-- if (proxy.get_name_owner() == null) {
-+ if (proxy.get_name_owner() != null) {
-+ available = true;
-+ complete = true;
-+ }
-+ else {
- available = false;
- complete = true;
- }
-@@ -89,24 +92,6 @@
- available = false;
- complete = true;
- }
--
-- if (!complete) {
-- // A bit of abstraction leakage here; we have to keep these imports in
-- // line with what duplicity uses. Maybe we should add to duplicity a way
-- // to ask 'can I use this backend?'
-- pyu1 = PythonChecker.get_checker("ubuntuone.platform.credentials, ubuntuone.couch.auth");
-- if (pyu1.complete) {
-- available = pyu1.available;
-- complete = pyu1.complete;
-- }
-- else {
-- pyu1.notify["complete"].connect(() => {
-- available = pyu1.available;
-- complete = pyu1.complete;
-- pyu1 = null;
-- });
-- }
-- }
- }
- }
-
Copied: deja-dup/repos/community-x86_64/update-u1-pythonchecker.patch (from rev 85691, deja-dup/trunk/update-u1-pythonchecker.patch)
===================================================================
--- community-x86_64/update-u1-pythonchecker.patch (rev 0)
+++ community-x86_64/update-u1-pythonchecker.patch 2013-03-05 09:07:44 UTC (rev 85692)
@@ -0,0 +1,13 @@
+=== modified file 'common/BackendU1.vala'
+--- common/BackendU1.vala 2012-11-05 15:10:54 +0000
++++ common/BackendU1.vala 2012-11-05 15:17:28 +0000
+@@ -94,7 +94,7 @@
+ // A bit of abstraction leakage here; we have to keep these imports in
+ // line with what duplicity uses. Maybe we should add to duplicity a way
+ // to ask 'can I use this backend?'
+- pyu1 = PythonChecker.get_checker("ubuntuone.platform.credentials, ubuntuone.couch.auth");
++ pyu1 = PythonChecker.get_checker("oauthlib, httplib2");
+ if (pyu1.complete) {
+ available = pyu1.available;
+ complete = pyu1.complete;
+
More information about the arch-commits
mailing list