← Back to branch summary

~ubuntu-desktop/deja-dup/ubuntu

« back to all changes in this revision

Viewing changes to debian/patches/allow-no-packagekit.patch

  • Committer: Michael Terry
  • Date: 2017-08-22 23:35:23 UTC
  • Revision ID: michael.terry@canonical.com-20170822233523-7896z0p4l832r3j6
Tags: 35.5-0ubuntu1
https://launchpad.net/bugs/1368640
* New upstream release
  - Fix needing to click cancel twice on progress dialog (LP: #1368640)
  - Fix a bug when restoring missing files that caused not every older
    missing files to be shown
  - No longer show a needed dependency with updates as uninstalled
* debian/patches/allow-no-packagekit.patch:
  - Dropped, applied upstream

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/allow-no-packagekit.patch
1
 
Index: deja-dup-35.4/libdeja/Operation.vala
2
 
===================================================================
3
 
--- deja-dup-35.4.orig/libdeja/Operation.vala
4
 
+++ deja-dup-35.4/libdeja/Operation.vala
5
 
@@ -288,6 +288,9 @@ public abstract class Operation : Object
6
 
     } catch (IOError.NOT_FOUND e) {
7
 
       // This happens when the packagekit daemon isn't running -- it can't find the socket
8
 
       return;
9
 
+    } catch (Pk.ControlError e) {
10
 
+      // This can happen when the packagekit daemon isn't installed or can't start(?)
11
 
+      return;
12
 
     } catch (Error e) {
13
 
       raise_error("%s".printf(e.message), null);
14
 
       done(false, false, null);