Merge lp:~dawgfoto/duplicity/fixup1251 into lp:~duplicity-team/duplicity/0.8-series

[Martin Nowak]

Avoid redundant replication of already present backup sets.

Fixed by adding back BackupSet.__eq__ which was accidentally(?) removed in 1251.
http://bazaar.launchpad.net/~duplicity-team/duplicity/0.8-series/revision/1251/duplicity/collections.py

Equality comparison is used here http://bazaar.launchpad.net/~duplicity-team/duplicity/0.8-series/view/head:/bin/duplicity?start_revid=1297#L1076.

Was already wondering why this stopped working.

[Kenneth Loafman (kenneth-loafman)]

Thanks for the catch! Not sure how it got deleted.

[edso (ed.so)]

On 1/21/2018 12:19, Kenneth Loafman wrote:
> Thanks for the catch! Not sure how it got deleted.
>

hey,

had a quick look just to find our where it got missing and _couldn't find_ a point where it existed earlier. checked
  http://bazaar.launchpad.net/~duplicity-team/duplicity/0.6-series/view/head:/duplicity/collections.py
  http://bazaar.launchpad.net/~duplicity-team/duplicity/0.7-series/view/head:/duplicity/collections.py
  http://bazaar.launchpad.net/~duplicity-team/duplicity/0.8-series/view/head:/duplicity/collections.py
and sampled some earlier revisions in each.

can someone point to a revision of collection.py that held this code in the past?

..ede/duply.net

[Kenneth Loafman (kenneth-loafman)]

All in series-8 - it was added in rev 1209 to support replicate, then
removed in 1251 by accident.

On Sun, Jan 21, 2018 at 5:42 AM, edso <email address hidden> wrote:

> On 1/21/2018 12:19, Kenneth Loafman wrote:
> > Thanks for the catch! Not sure how it got deleted.
> >
>
> hey,
>
> had a quick look just to find our where it got missing and _couldn't find_
> a point where it existed earlier. checked
> http://bazaar.launchpad.net/~duplicity-team/duplicity/0.6-
> series/view/head:/duplicity/collections.py
> http://bazaar.launchpad.net/~duplicity-team/duplicity/0.7-
> series/view/head:/duplicity/collections.py
> http://bazaar.launchpad.net/~duplicity-team/duplicity/0.8-
> series/view/head:/duplicity/collections.py
> and sampled some earlier revisions in each.
>
> can someone point to a revision of collection.py that held this code in
> the past?
>
> ..ede/duply.net
>
> --
> https://code.launchpad.net/~dawgfoto/duplicity/fixup1251/+merge/336393
> You are subscribed to branch lp:duplicity.
>

[edso (ed.so)]

ahhh.. makes sense, thanks for clearing this up!.. ede

On 1/21/2018 13:21, Kenneth Loafman wrote:
> All in series-8 - it was added in rev 1209 to support replicate, then
> removed in 1251 by accident.
>
>
> On Sun, Jan 21, 2018 at 5:42 AM, edso <email address hidden> wrote:
>
>> On 1/21/2018 12:19, Kenneth Loafman wrote:
>>> Thanks for the catch! Not sure how it got deleted.
>>>
>>
>> hey,
>>
>> had a quick look just to find our where it got missing and _couldn't find_
>> a point where it existed earlier. checked
>> http://bazaar.launchpad.net/~duplicity-team/duplicity/0.6-
>> series/view/head:/duplicity/collections.py
>> http://bazaar.launchpad.net/~duplicity-team/duplicity/0.7-
>> series/view/head:/duplicity/collections.py
>> http://bazaar.launchpad.net/~duplicity-team/duplicity/0.8-
>> series/view/head:/duplicity/collections.py
>> and sampled some earlier revisions in each.
>>
>> can someone point to a revision of collection.py that held this code in
>> the past?
>>
>> ..ede/duply.net
>>
>> --
>> https://code.launchpad.net/~dawgfoto/duplicity/fixup1251/+merge/336393
>> You are subscribed to branch lp:duplicity.
>>
>

On 1/21/2018 13:21, Kenneth Loafman wrote:
> All in series-8 - it was added in rev 1209 to support replicate, then
> removed in 1251 by accident.
>
>
> On Sun, Jan 21, 2018 at 5:42 AM, edso <email address hidden> wrote:
>
>> On 1/21/2018 12:19, Kenneth Loafman wrote:
>>> Thanks for the catch! Not sure how it got deleted.
>>>
>>
>> hey,
>>
>> had a quick look just to find our where it got missing and _couldn't find_
>> a point where it existed earlier. checked
>> http://bazaar.launchpad.net/~duplicity-team/duplicity/0.6-
>> series/view/head:/duplicity/collections.py
>> http://bazaar.launchpad.net/~duplicity-team/duplicity/0.7-
>> series/view/head:/duplicity/collections.py
>> http://bazaar.launchpad.net/~duplicity-team/duplicity/0.8-
>> series/view/head:/duplicity/collections.py
>> and sampled some earlier revisions in each.
>>
>> can someone point to a revision of collection.py that held this code in
>> the past?
>>
>> ..ede/duply.net
>>
>> --
>> https://code.launchpad.net/~dawgfoto/duplicity/fixup1251/+merge/336393
>> You are subscribed to branch lp:duplicity.
>>
>

=== modified file 'duplicity/collections.py'
--- duplicity/collections.py	2017-12-21 21:10:02 +0000
+++ duplicity/collections.py	2018-01-20 02:18:01 +0000
@@ -300,6 +300,16 @@
         """
         return len(self.volume_name_dict.keys())
 
+    def __eq__(self, other):
+        """
+        Return whether this backup set is equal to other
+        """
+        return self.type == other.type and \
+            self.time == other.time and \
+            self.start_time == other.start_time and \
+            self.end_time == other.end_time and \
+            len(self) == len(other)
+
 
 class BackupChain:
     """