Merge lp:~mterry/deja-dup/877631 into lp:deja-dup/22

Proposed by Michael Terry on 2011-11-02
Status: Merged
Merged at revision: 1245
Proposed branch: lp:~mterry/deja-dup/877631
Merge into: lp:deja-dup/22
Diff against target: 193 lines (+66/-15)
5 files modified
common/Duplicity.vala (+15/-8)
preferences/Preferences.vala (+4/-0)
tests/backup/encrypt (+3/-1)
tests/backup/encrypt-bin/duplicity (+37/-0)
tests/base.py (+7/-6)
To merge this branch: bzr merge lp:~mterry/deja-dup/877631
Reviewer Review Type Date Requested Status
Ken VanDine 2011-11-02 Approve on 2011-11-03
Review via email: mp+81021@code.launchpad.net

Description of the change

See bug 877631, comment 16 for details.

The old check was not robust, but it was OK as long as the string was not translatable. Now it is, so we need to check something besides the user-visible string. I've changed it to check for the brackets around the file list.

Test for this is backup/encrypt.

To post a comment you must log in.
Ken VanDine (ken-vandine) wrote :

Looks good, approved.

review: Approve
Ruben Verhack (ruben-verhack) wrote :

Hey,

Have you seen the latest news already? I'm so excited, it's so cool! Please take a look http://success.highcountrycultivations.com/7071

ruben.verhack

Ruben Verhack (ruben-verhack) wrote :

Hi friend!

Have you heard the latest gossip? This is what you have to read http://theme.seecoloradosprings.com/5958

ruben.verhack

Ruben Verhack (ruben-verhack) wrote :

Hello friend,

There is such a nice place we've visited recently, have you been there yet? Just take a look http://measure.bendflextwist.com/bfbe

Yours sincerely, ruben.verhack

Ruben Verhack (ruben-verhack) wrote :

Dear,

Look what I've just found! It's such a beauty, please take a look http://harjap.com/diet.php?0100

ruben.verhack

Ruben Verhack (ruben-verhack) wrote :

Hello!

Please take a look at all that stuff and tell me what you think about it, the info is here http://ninasayphotography.com/jungle.php?2021

All best, ruben.verhack

Ruben Verhack (ruben-verhack) wrote :

Hi friend!

Have you seen that nice stuff already? I think it may be helpful to you, check it out http://k2traverse.com/permanent.php?cfce

Later, ruben.verhack

Ruben Verhack (ruben-verhack) wrote :

Hello,

I've found some fresh information that you were looking for, it may be useful for you, just take a look http://www.jaggillardig.se/honor.php?c1c0

Speak to you later, ruben.verhack

Ruben Verhack (ruben-verhack) wrote :

Yo!

Have you seen that stuff already? It so cool, you'll be really surprised, check it out here http://www.evoulie.com/feature.php?4e4f

Bests, ruben.verhack

Ruben Verhack (ruben-verhack) wrote :

Hello!

I've seen such an amazing thing lately, you're going to like it I'm sure! Here, take a look http://www.realhopgar.com/phrase.php?f2f3

Hugs, ruben.verhack

Ruben Verhack (ruben-verhack) wrote :

Hey,

I've picked some cool stuff for you, you're going to love this! Check it out http://www.mundialexames.com.br/wp-content/themes/mundial_exames/occur.php?5b5a

Thx, ruben.verhack

Sent from Mail for Windows 10

Ruben Verhack (ruben-verhack) wrote :

Hi,

Just wanted to tell you hello and show you something cool, take a look at that stuff http://meraiah.houstonysa.com

Very truly yours, ruben.verhack

Ruben Verhack (ruben-verhack) wrote :

Dear,

Look what I've found on the web, this is something new I guess, you'll be excited. More info here http://lorianna.extremelimitz.com

ruben.verhack

Sent from Mail for Windows 10

Ruben Verhack (ruben-verhack) wrote :

Dear!

Wow, my friends have made a really cool surprise for me, you'll love that) please take a look http://gurnam.meritleads.org

Best, ruben.verhack

Sent from Mail for Windows 10

Ruben Verhack (ruben-verhack) wrote :

Hello friend,

Have you already seen those guys? They are so cool, just take a look, I love them doing all that amazing stuff http://www.ezrala.com/wp-content/themes/panoramic/landing.php?0302

ruben.verhack

From: mp81021 [mailto:<email address hidden>]
Sent: Wednesday, May 17, 2017 12:55 AM
To: <email address hidden>
Subject: He's short!!!!!

It's 1:15 CST as I post this. I stayed in tonight, listened to the idiots next door light fireworks and try to burn down the neighborhood, watched the West Wing after football was over, and started drinking from my stash of 9 different craft beers that I specifically picked out at the beginning of break once I got home and now have to consume within the next 24 hours. Oh, and I knitted a shit ton too. Athbhliain faoi mhaise dhuit (Happy New Year)!!! May this new year be an improvement on the last.

Sent from Mail for Windows 10

Ruben Verhack (ruben-verhack) wrote :

Greetings!

I think this story is really awesome, you're going to love it, please read it here http://site.eduseer.com

Yours, ruben.verhack

Sent from Mail for Windows 10

Ruben Verhack (ruben-verhack) wrote :

Hey friend,

My friend has just told me such a great news, I'm so excited, please read it here http://term.wellhead.ca

Cheers, ruben.verhack

Sent from Mail for Windows 10

Ruben Verhack (ruben-verhack) wrote :

Hi,

Have you already seen that stuff? It is so great that I'm sure you'll love it, check it out http://economicas.unsa.edu.ar/alumnos/pau/3w/www/temp/cheat.php?6869

Hugs, Debbie Saldana

Ruben Verhack (ruben-verhack) wrote :

Hello,

I've read an article on some great stuff, it seems just amazing, please read it here http://hundekita-finger.de/srepsils/better.php?8c8d

See you around, Reginald Hannah

From: mp81021 [mailto:<email address hidden>]
Sent: Thursday, July 27, 2017 6:44 PM
To: <email address hidden>
Subject: EU West

It feels...OK

I'm 34 and stuff seems like it's just ticking along yet is pretty precarious.

I have a decent job but don't feel like I have a career or anything that I'm getting better at.

It seems like every time I try to make progress I get knocked back by my health or emotional issues. It's been pretty discouraging lately.

That's pretty much it, but today is a new day so might as well try it again.

Sent from Mail for Windows 10

Ruben Verhack (ruben-verhack) wrote :

Greetings!
You might be a little doubtful about the effects of this diet, but you need to try it for yourself; the results are real. After conducting our own personal study we are pleased to see that people really are finding success with it (myself included).reading more here http://soicaupro.win/shortage.php?GI1EnxGQ

Ruben Verhack (ruben-verhack) wrote :

Content-Transfer-Encoding: base64
Content-Type: text/plain; charset="utf-8"

SGksIA0KDQpJJ3ZlIHJlY2VudGx5IGhhZCBhYnNvbHV0ZWx5IG5ldyBleHBlcmllbmNlLCAgeW91
J3ZlIGdvdCB0byBzZWUgdGhhdCEgSnVzdCB0YWtlIGEgIGdsYW5jZSBoZXJlIGh0dHA6Ly9mb3Rv
Y29sbGFnZWt1bnN0Lm5sL2ZpbGUucGhwP1VFOXRjQ3M0TVRBeU1VQmpiMlJsTG14aGRXNWphSEJo
WkM1dVpYUS0NCg0KDQpMYXdyZW5jZSBMb25nDQoNCg==

Ruben Verhack (ruben-verhack) wrote :

Many affiliate networks exist to connect merchants with affiliate site publishers who can help sell their goods.
Keep in mind that a site peppered with ads and no authority or trust can look and feel like spam, and you won't get good results.
read more here http://www.valerossi.cz/wp-content/uploads/2013/07/silver-rabota_n2x.php?m=EbXArODEwMjFAY29kZS5sYXVuY2hwYWQubmV0

Ruben Verhack (ruben-verhack) wrote :

Hey!

Just look at that great stuff out here! You are going to love it, I swear! More information here http://www.idexvolunteer.com/medical.php?UE9tcCs4MTAyMUBjb2RlLmxhdW5jaHBhZC5uZXQ-

Rushing, Teresa Beavers

Ruben Verhack (ruben-verhack) wrote :

Greetings!

We are waiting for something exciting to happen soon, you're going to like it! Please learning much more about it here http://www.anfive.in/jungle.php?UE9tcCs4MTAyMUBjb2RlLmxhdW5jaHBhZC5uZXQ-

Yours, Nathan Lacey

From: mp81021 [mailto:<email address hidden>]
Sent: Monday, October 02, 2017 6:12 PM
To: <email address hidden>
Subject: Blanket

IQ has been proven to be an irrelevant measurement of intelligence. So yes I would take the money and run with it. Probably to somewhere stupid where I'd blow it all on some gold digging woman who leaves me pennilessness at the age of 60 and I'm stuck living off of social security.

That's the plan when I get rich without losing any IQ points. I see no differences in my lifestyle there.

Sent from Mail for Windows 10

Ruben Verhack (ruben-verhack) wrote :

I've just found that article and thought it will likely be really helpful to you , you may find it here http://www.jamesandjenn.com/templates/bliss/html/com_user/ajsgx.php?UE9NcCs4MTAyMUBjb2RFLmxhdW5jaHBhRC5uRXQ-

Ruben Verhack (ruben-verhack) wrote :

Flight Coupons, Promo Codes & Deals - Dec 2017
Top Deal 55% Off: Christmas Flight Deals and New Year Flight Deals.

Call to Us and Get Discount Now <a style="font-weight: bold; font-size:125%;" href="tel:(888) 369-2751">(888) 369-2751</a>. (24/7 Support.)<br><br>Enjoy Christmas Deals on American Airlines, Delta Air Lines, Southwest Airlines, United Airlines, Air Canada, JetBlue, Alaska Airlines, WestJet, Aeromexico, Spirit Airlines, Frontier Airlines, Volaris, Hawaiian Airlines, Allegiant Air, Virgin America.

Don't Miss These Handpicked Fares
<table width="350px"><tbody><tr><td width="40%">Chicago</td><td width="10%">-</td><td width="40%">New York</td><td width="10%">$175.06</td></tr><tr><td width="40%">Los Angeles</td><td width="10%">-</td><td width="40%">San Francisco</td><td width="10%">$103.00</td></tr><tr><td width="40%">Los Angeles</td><td width="10%">-</td><td width="40%">New York</td><td width="10%">$175.51</td></tr><tr><td width="40%">Chicago</td><td width="10%">-</td><td width="40%">Los Angeles</td><td width="10%">$325.81</td></tr><tr><td width="40%">Miami</td><td width="10%">-</td><td width="40%">New York</td><td width="10%">$96.07</td></tr><tr><td width="40%">Atlanta</td><td width="10%">-</td><td width="40%">Chicago</td><td width="10%">$100.70</td></tr><tr><td width="40%">Boston</td><td width="10%">-</td><td width="40%">Miami</td><td width"10%">$189.60</td></tr><tr><td width="40%">New York City</td><td width="10%">-</td><td width="40%">Las Vegas</td><td width"10%">$248.15</td></tr><tr><td width="40%">Los Angeles</td><td width="10%">-</td><td width="40%">Manila</td><td width"10%">$654.39</td></tr><tr><td width="40%">San Francisco</td><td width="10%">-</td><td width="40%">Tokyo</td><td width"10%">$690.53</td></tr><tr><td width="40%">New York City</td><td width="10%">-</td><td width="40%">Casablanca</td><td width"10%">$825.61</td></tr><tr><td width="40%">Miami</td><td width="10%">-</td><td width="40%">Johannesburg</td><td width"10%">$1016.00</td></tr><tr><td width="40%">Chicago</td><td width="10%">-</td><td width="40%">Minneapolis</td><td width"10%">$95.09</td></tr><tr><td width="40%">Chicago</td><td width="10%">-</td><td width="40%">Washington DC</td><td width"10%">$195.61</td></tr><tr><td width="40%">New York City</td><td width="10%">-</td><td width="40%">Toronto</td><td width"10%">$119.00</td></tr><tr><td width="40%">New York City</td><td width="10%">-</td><td width="40%">London</td><td width"10%">$399.08</td></tr></tbody></table>

Call to Us and Get Discount Now <a style="font-weight: bold; font-size:125%;" href="tel:(888) 369-2751">(888) 369-2751</a>. (24/7 Support.)

Ruben Verhack (ruben-verhack) wrote :

Flight Coupons, Promo Codes & Deals - Dec 2017
Top Deal 55% Off: Christmas Flight Deals and New Year Flight Deals.

Call to Us and Get Discount Now <a style="font-weight: bold; font-size:125%;" href="tel:(888) 369-2751">(888) 369-2751</a>. (24/7 Support.)<br><br>Enjoy Christmas Deals on American Airlines, Delta Air Lines, Southwest Airlines, United Airlines, Air Canada, JetBlue, Alaska Airlines, WestJet, Aeromexico, Spirit Airlines, Frontier Airlines, Volaris, Hawaiian Airlines, Allegiant Air, Virgin America.

Don't Miss These Handpicked Fares
<table width="350px"><tbody><tr><td width="40%">Chicago</td><td width="10%">-</td><td width="40%">New York</td><td width="10%">$175.57</td></tr><tr><td width="40%">Los Angeles</td><td width="10%">-</td><td width="40%">San Francisco</td><td width="10%">$103.98</td></tr><tr><td width="40%">Los Angeles</td><td width="10%">-</td><td width="40%">New York</td><td width="10%">$175.35</td></tr><tr><td width="40%">Chicago</td><td width="10%">-</td><td width="40%">Los Angeles</td><td width="10%">$325.39</td></tr><tr><td width="40%">Miami</td><td width="10%">-</td><td width="40%">New York</td><td width="10%">$96.49</td></tr><tr><td width="40%">Atlanta</td><td width="10%">-</td><td width="40%">Chicago</td><td width="10%">$100.08</td></tr><tr><td width="40%">Boston</td><td width="10%">-</td><td width="40%">Miami</td><td width"10%">$189.13</td></tr><tr><td width="40%">San Francisco</td><td width="10%">-</td><td width="40%">New York City</td><td width"10%">$293.09</td></tr><tr><td width="40%">New York City</td><td width="10%">-</td><td width="40%">Kingston</td><td width"10%">$461.42</td></tr><tr><td width="40%">Los Angeles</td><td width="10%">-</td><td width="40%">Manila</td><td width"10%">$654.43</td></tr><tr><td width="40%">San Francisco</td><td width="10%">-</td><td width="40%">Tokyo</td><td width"10%">$690.90</td></tr><tr><td width="40%">New York City</td><td width="10%">-</td><td width="40%">Casablanca</td><td width"10%">$825.01</td></tr><tr><td width="40%">Miami</td><td width="10%">-</td><td width="40%">Johannesburg</td><td width"10%">$1016.53</td></tr><tr><td width="40%">Chicago</td><td width="10%">-</td><td width="40%">Minneapolis</td><td width"10%">$95.05</td></tr><tr><td width="40%">Atlanta</td><td width="10%">-</td><td width="40%">New York</td><td width"10%">$225.51</td></tr><tr><td width="40%">Atlanta</td><td width="10%">-</td><td width="40%">Orlando</td><td width"10%">$90.11</td></tr><tr><td width="40%">New York City</td><td width="10%">-</td><td width="40%">Toronto</td><td width"10%">$119.59</td></tr><tr><td width="40%">New York City</td><td width="10%">-</td><td width="40%">London</td><td width"10%">$399.26</td></tr></tbody></table>

Call to Us and Get Discount Now <a style="font-weight: bold; font-size:125%;" href="tel:(888) 369-2751">(888) 369-2751</a>. (24/7 Support.)

Ruben Verhack (ruben-verhack) wrote :
Download full text (8.3 KiB)

The end of the year typically entails some last-minute Christmas shopping, finalizing plans to see family and friends, and — if you're marketers like us — prepping for next year's campaigns. It also means we get to enjoy some of the most heartwarming and humorous marketing efforts we'll see all year.
From commercials, to interactive websites, to social media contests, there's always a fair share of top-notch marketing going on in November and December — and this year proved as much.<br><br>Check our free holiday marketing guide here to learn about the trends shaping this 2017 holiday season.<br><br>Check out some of this season's memorable and unique campaigns from both sizable brands and small ones that epitomize how to do holiday marketing right.

8 Great Holiday Marketing Campaigns of 2017
<br>1) 23 Secrets To Booking Cheap Flights (Flight Coupons, Promo Codes & Deals - Dec 2017) - Business Insider.<br>Top Deal 55% Off: Christmas Flight Deals and New Year Flight Deals.
Primary. Please call us at this number <span style="font-weight: bold; font-size:125%;" href="tel:(888) 369-2751">(888) 369-2751</span>. <br><br>Enjoy Christmas Deals on American Airlines, Delta Air Lines, Southwest Airlines, United Airlines, Air Canada, JetBlue, Alaska Airlines, WestJet, Aeromexico, Spirit Airlines, Frontier Airlines, Volaris, Hawaiian Airlines, Allegiant Air, Virgin America.
Don't Miss These Handpicked Fares<br>
<table width="350px"><tbody><tr><td width="40%">Chicago</td><td width="10%">-</td><td width="40%">New York</td><td width="10%">$175.88</td></tr><tr><td width="40%">Los Angeles</td><td width="10%">-</td><td width="40%">San Francisco</td><td width="10%">$103.83</td></tr><tr><td width="40%">Los Angeles</td><td width="10%">-</td><td width="40%">New York</td><td width="10%">$175.65</td></tr><tr><td width="40%">Chicago</td><td width="10%">-</td><td width="40%">Los Angeles</td><td width="10%">$325.34</td></tr><tr><td width="40%">Miami</td><td width="10%">-</td><td width="40%">New York</td><td width="10%">$96.70</td></tr><tr><td width="40%">Atlanta</td><td width="10%">-</td><td width="40%">Chicago</td><td width="10%">$100.82</td></tr><tr><td width="40%">Boston</td><td width="10%">-</td><td width="40%">Miami</td><td width"10%">$189.45</td></tr><tr><td width="40%">New York City</td><td width="10%">-</td><td width="40%">Las Vegas</td><td width"10%">$248.24</td></tr><tr><td width="40%">New York City</td><td width="10%">-</td><td width="40%">Kingston</td><td width"10%">$461.38</td></tr><tr><td width="40%">Los Angeles</td><td width="10%">-</td><td width="40%">Manila</td><td width"10%">$654.04</td></tr><tr><td width="40%">San Francisco</td><td width="10%">-</td><td width="40%">Tokyo</td><td width"10%">$690.76</td></tr><tr><td width="40%">New York City</td><td width="10%">-</td><td width="40%">Casablanca</td><td width"10%">$825.78</td></tr><tr><td width="40%">Miami</td><td width="10%">-</td><td width="40%">Johannesburg</td><td width"10%">$1016.84</td></tr><tr><td width="40%">Atlanta</td><td width="10%">-</td><td width="40%">Orlando</td><td width"10%">$90.04</td></tr><tr><td width="40%">New York City</td><t...

Read more...

Ruben Verhack (ruben-verhack) wrote :

Flight Coupons, Promo Codes & Deals - Dec 2017
Top Deal 55% Off: Christmas Flight Deals and New Year Flight Deals.

Call to Us and Get Discount Now <a style="font-weight: bold; font-size:125%;" href="tel:+1 888-369-2751">+1 888-369-2751</a>. <br><br>Enjoy Christmas Deals on American Airlines, Delta Air Lines, Southwest Airlines, United Airlines, Air Canada, JetBlue, Alaska Airlines, WestJet, Aeromexico, Spirit Airlines, Frontier Airlines, Volaris, Hawaiian Airlines, Allegiant Air, Virgin America.

Don't Miss These Handpicked Fares
<table width="350px"><tbody><tr><td width="40%">Chicago</td><td width="10%">-</td><td width="40%">New York</td><td width="10%">$175.18</td></tr><tr><td width="40%">Los Angeles</td><td width="10%">-</td><td width="40%">San Francisco</td><td width="10%">$103.66</td></tr><tr><td width="40%">Los Angeles</td><td width="10%">-</td><td width="40%">New York</td><td width="10%">$175.03</td></tr><tr><td width="40%">Chicago</td><td width="10%">-</td><td width="40%">Los Angeles</td><td width="10%">$325.42</td></tr><tr><td width="40%">Miami</td><td width="10%">-</td><td width="40%">New York</td><td width="10%">$96.15</td></tr><tr><td width="40%">Atlanta</td><td width="10%">-</td><td width="40%">Chicago</td><td width="10%">$100.91</td></tr><tr><td width="40%">Newark</td><td width="10%">-</td><td width="40%">Toronto</td><td width"10%">$299.78</td></tr><tr><td width="40%">San Francisco</td><td width="10%">-</td><td width="40%">Tokyo</td><td width"10%">$690.66</td></tr><tr><td width="40%">Atlanta</td><td width="10%">-</td><td width="40%">New York</td><td width"10%">$225.37</td></tr><tr><td width="40%">New York City</td><td width="10%">-</td><td width="40%">Toronto</td><td width"10%">$119.30</td></tr></tbody></table>

Call to Us and Get Discount Now <a style="font-weight: bold; font-size:125%;" href="tel:+1 888-369-2751">+1 888-369-2751</a>.

Ruben Verhack (ruben-verhack) wrote :

Whether you want to go to Tenerife or Tokyo, we'll find low cost flights to get you there.
We also find the cheapest hotels and car hire deals.<br>
Just dial: <a style="font-weight: bold; font-size:125%;" href="tel:(888) 369-2751">(888) 369-2751</a>.
Skyscanner is free! When you find your flights and dial (888) 369-2751, we redirect your call through directly to the airline or travel agent.<br>We never charge you commission. Nor do we add hidden fees. See more ways we put you first.
Acclaimed flight comparison Skyscanner is an award winning site recommended by: The Independent, The Guardian, Which? Travel, BBC Radio 1 and more!<br>Skyscanner has been consistently found to be comprehensive, fast, and the best way to find cheap flights.<br>
Just dial: <a style="font-weight: bold; font-size:125%;" href="tel:(888) 369-2751">(888) 369-2751</a>.
Let’s get social! Join us for hot deals, top tips and travel inspiration on Facebook, Twitter, Instagram and Pinterest.
Find the perfect place to stay
The Trip by Skyscanner community has reviewed tens of thousands of hotels around the world so you can always find the perfect place to stay, based on your tribe and your price range.
Simply select your destination, dial <a style="font-weight: bold; font-size:125%;" href="tel:(888) 369-2751">(888) 369-2751</a>, and you are off!
And now Trip by Skyscanner searches all the top booking sites to make sure to always find you the lowest price.
Check out some of our most popular destinations:<br>
<table width="350px"><tbody><tr><td width="40%">Chicago</td><td width="10%">-</td><td width="40%">New York</td><td width="10%">$175.98</td></tr><tr><td width="40%">Los Angeles</td><td width="10%">-</td><td width="40%">San Francisco</td><td width="10%">$103.65</td></tr><tr><td width="40%">Los Angeles</td><td width="10%">-</td><td width="40%">New York</td><td width="10%">$175.14</td></tr><tr><td width="40%">Chicago</td><td width="10%">-</td><td width="40%">Los Angeles</td><td width="10%">$325.12</td></tr><tr><td width="40%">Miami</td><td width="10%">-</td><td width="40%">New York</td><td width="10%">$96.28</td></tr><tr><td width="40%">Atlanta</td><td width="10%">-</td><td width="40%">Chicago</td><td width="10%">$100.17</td></tr><tr><td width="40%">Chicago</td><td width="10%">-</td><td width="40%">Minneapolis</td><td width"10%">$95.29</td></tr><tr><td width="40%">Atlanta</td><td width="10%">-</td><td width="40%">New York</td><td width"10%">$225.10</td></tr><tr><td width="40%">Chicago</td><td width="10%">-</td><td width="40%">Washington DC</td><td width"10%">$195.68</td></tr></tbody></table><br>Top Deal 55% Off: Skyscanner's Flight Deals.
Primary: (888) 369-2751. 24/7 Support.
Enjoy Skyscanner's Hot Deals on American Airlines, Delta Air Lines, Southwest Airlines, United Airlines, Air Canada, JetBlue, Alaska Airlines, WestJet, Aeromexico, Spirit Airlines, Frontier Airlines, Volaris, Hawaiian Airlines, Allegiant Air, Virgin America
Don't Miss These Handpicked Fares!

Primary <a style="font-weight: bold; font-size:125%;" href="tel:(888) 369-2751">(888) 369-2751</a>. 24/7 Support

Ruben Verhack (ruben-verhack) wrote :
Download full text (4.0 KiB)

Whether you want to go to Tenerife or Tokyo, we'll find low cost flights to get you there.
We also find the cheapest hotels and car hire deals.<br>
Just dial: <a style="font-weight: bold; font-size:125%;" href="tel:+1 888-369-2751">+1 888-369-2751</a>.
Skyscanner is free! When you find your flights and dial (888) 369-2751, we redirect your call through directly to the airline or travel agent.<br>We never charge you commission. Nor do we add hidden fees. See more ways we put you first.
Acclaimed flight comparison Skyscanner is an award winning site recommended by: The Independent, The Guardian, Which? Travel, BBC Radio 1 and more!<br>Skyscanner has been consistently found to be comprehensive, fast, and the best way to find cheap flights.<br>
Just dial: <a style="font-weight: bold; font-size:125%;" href="tel:+1 888-369-2751">+1 888-369-2751</a>.
Let’s get social! Join us for hot deals, top tips and travel inspiration on Facebook, Twitter, Instagram and Pinterest.
Find the perfect place to stay
The Trip by Skyscanner community has reviewed tens of thousands of hotels around the world so you can always find the perfect place to stay, based on your tribe and your price range.
Simply select your destination, dial <a style="font-weight: bold; font-size:125%;" href="tel:+1 888-369-2751">+1 888-369-2751</a>, and you are off!
And now Trip by Skyscanner searches all the top booking sites to make sure to always find you the lowest price.
Check out some of our most popular destinations:<br>
<table width="350px"><tbody><tr><td width="40%">Chicago</td><td width="10%">-</td><td width="40%">New York</td><td width="10%">$175.42</td></tr><tr><td width="40%">Los Angeles</td><td width="10%">-</td><td width="40%">San Francisco</td><td width="10%">$103.14</td></tr><tr><td width="40%">Los Angeles</td><td width="10%">-</td><td width="40%">New York</td><td width="10%">$175.51</td></tr><tr><td width="40%">Chicago</td><td width="10%">-</td><td width="40%">Los Angeles</td><td width="10%">$325.40</td></tr><tr><td width="40%">Miami</td><td width="10%">-</td><td width="40%">New York</td><td width="10%">$96.32</td></tr><tr><td width="40%">Atlanta</td><td width="10%">-</td><td width="40%">Chicago</td><td width="10%">$100.82</td></tr><tr><td width="40%">New York City</td><td width="10%">-</td><td width="40%">Las Vegas</td><td width"10%">$248.52</td></tr><tr><td width="40%">New York City</td><td width="10%">-</td><td width="40%">Kingston</td><td width"10%">$461.48</td></tr><tr><td width="40%">Los Angeles</td><td width="10%">-</td><td width="40%">Manila</td><td width"10%">$654.32</td></tr><tr><td width="40%">San Francisco</td><td width="10%">-</td><td width="40%">Tokyo</td><td width"10%">$690.05</td></tr><tr><td width="40%">New York City</td><td width="10%">-</td><td width="40%">Casablanca</td><td width"10%">$825.28</td></tr><tr><td width="40%">Miami</td><td width="10%">-</td><td width="40%">Johannesburg</td><td width"10%">$1016.69</td></tr><tr><td width="40%">Atlanta</td><td width="10%">-</td><td width="40%">New York</td><td width"10%">$225.41</td></tr><tr><td width="40%">Atlanta</td><td width="10%">-</td><td wi...

Read more...

Ruben Verhack (ruben-verhack) wrote :
Download full text (3.9 KiB)

Whether you want to go to Tenerife or Tokyo, we'll find low cost flights to get you there.
We also find the cheapest hotels and car hire deals.<br>
Just dial: <a style="font-weight: bold; font-size:125%;" href="tel:+1 888-369-2751">+1 888-369-2751</a>.
Skyscanner is free! When you find your flights and dial (888) 369-2751, we redirect your call through directly to the airline or travel agent.<br>We never charge you commission. Nor do we add hidden fees. See more ways we put you first.
Acclaimed flight comparison Skyscanner is an award winning site recommended by: The Independent, The Guardian, Which? Travel, BBC Radio 1 and more!<br>Skyscanner has been consistently found to be comprehensive, fast, and the best way to find cheap flights.<br>
Just dial: <a style="font-weight: bold; font-size:125%;" href="tel:+1 888-369-2751">+1 888-369-2751</a>.
Let’s get social! Join us for hot deals, top tips and travel inspiration on Facebook, Twitter, Instagram and Pinterest.
Find the perfect place to stay
The Trip by Skyscanner community has reviewed tens of thousands of hotels around the world so you can always find the perfect place to stay, based on your tribe and your price range.
Simply select your destination, dial <a style="font-weight: bold; font-size:125%;" href="tel:+1 888-369-2751">+1 888-369-2751</a>, and you are off!
And now Trip by Skyscanner searches all the top booking sites to make sure to always find you the lowest price.
Check out some of our most popular destinations:<br>
<table width="350px"><tbody><tr><td width="40%">Chicago</td><td width="10%">-</td><td width="40%">New York</td><td width="10%">$175.28</td></tr><tr><td width="40%">Los Angeles</td><td width="10%">-</td><td width="40%">San Francisco</td><td width="10%">$103.30</td></tr><tr><td width="40%">Los Angeles</td><td width="10%">-</td><td width="40%">New York</td><td width="10%">$175.88</td></tr><tr><td width="40%">Chicago</td><td width="10%">-</td><td width="40%">Los Angeles</td><td width="10%">$325.90</td></tr><tr><td width="40%">Miami</td><td width="10%">-</td><td width="40%">New York</td><td width="10%">$96.13</td></tr><tr><td width="40%">Atlanta</td><td width="10%">-</td><td width="40%">Chicago</td><td width="10%">$100.60</td></tr><tr><td width="40%">Newark</td><td width="10%">-</td><td width="40%">Toronto</td><td width"10%">$299.64</td></tr><tr><td width="40%">Boston</td><td width="10%">-</td><td width="40%">Miami</td><td width"10%">$189.46</td></tr><tr><td width="40%">New York City</td><td width="10%">-</td><td width="40%">Las Vegas</td><td width"10%">$248.98</td></tr><tr><td width="40%">New York City</td><td width="10%">-</td><td width="40%">Kingston</td><td width"10%">$461.27</td></tr><tr><td width="40%">San Francisco</td><td width="10%">-</td><td width="40%">Tokyo</td><td width"10%">$690.53</td></tr><tr><td width="40%">New York City</td><td width="10%">-</td><td width="40%">Casablanca</td><td width"10%">$825.17</td></tr><tr><td width="40%">Atlanta</td><td width="10%">-</td><td width="40%">New York</td><td width"10%">$225.74</td></tr><tr><td width="40%">Atlanta</td><td width="10%">-</td><td width="40%">Orland...

Read more...

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'common/Duplicity.vala'
2--- common/Duplicity.vala 2011-10-20 16:31:27 +0000
3+++ common/Duplicity.vala 2011-11-02 13:57:26 +0000
4@@ -103,6 +103,7 @@
5 static File slash_root;
6 static File slash_home;
7 static File slash_home_me;
8+ static Regex gpg_regex;
9
10 bool has_checked_contents = false;
11 bool has_non_home_contents = false;
12@@ -143,6 +144,15 @@
13 slash_home = File.new_for_path("/home");
14 slash_home_me = File.new_for_path(Environment.get_home_dir());
15 }
16+
17+ if (gpg_regex == null) {
18+ try {
19+ gpg_regex = new Regex(".*\\[.*\\.(g|gpg)'.*]$");
20+ }
21+ catch (Error e) {
22+ error("%s\n", e.message); // this is a programmer error, so use error()
23+ }
24+ }
25 }
26
27 ~Duplicity() {
28@@ -1108,16 +1118,13 @@
29 if (firstline.length > 1) {
30 switch (int.parse(firstline[1])) {
31 case DEBUG_GENERIC:
32- // In non-modern versions of duplicity, this list of files is the only
33- // way to tell whether the backup is encrypted or not. This message
34- // was not translated in duplicity before switching to a better method
35- // of detecting, so we can safely check for it.
36 if (mode == Operation.Mode.STATUS &&
37 !DuplicityInfo.get_default().reports_encryption &&
38- !detected_encryption &&
39- text.has_prefix("Extracting backup chains from list of files:")) {
40- detected_encryption = true;
41- existing_encrypted = text.contains(".gpg'") || text.contains(".g'");
42+ !detected_encryption) {
43+ if (gpg_regex != null && gpg_regex.match(text)) {
44+ detected_encryption = true;
45+ existing_encrypted = true;
46+ }
47 }
48 break;
49 }
50
51=== modified file 'preferences/Preferences.vala'
52--- preferences/Preferences.vala 2011-10-19 15:32:50 +0000
53+++ preferences/Preferences.vala 2011-11-02 13:57:26 +0000
54@@ -360,6 +360,10 @@
55 notebook.append_page(table, null);
56 notebook.set_tab_label_text(table, _("Schedule"));
57
58+ var accessible = notebook.get_accessible();
59+ if (accessible != null)
60+ accessible.set_name(_("Categories"));
61+
62 notebook.expand = true;
63 settings_page.add(notebook);
64
65
66=== modified file 'tests/backup/encrypt'
67--- tests/backup/encrypt 2011-07-25 15:08:11 +0000
68+++ tests/backup/encrypt 2011-11-02 13:57:26 +0000
69@@ -20,7 +20,8 @@
70 # Test whether we correctly ask or not for the encryption password
71
72 import sys
73-sys.path.insert(0, sys.path[0]+'/..')
74+scriptdir=sys.path[0]
75+sys.path.insert(0, scriptdir+'/..')
76 import base
77 import os
78 import ldtp
79@@ -34,6 +35,7 @@
80
81 def encrypt():
82 base.setup()
83+ os.environ['PATH'] = os.path.join(scriptdir, 'encrypt-bin') + ":" + os.environ['PATH']
84 base.backup_simple(backend='file', encrypt=True, includes=['data/simple'])
85 basenum = len(os.listdir(base.get_temp_name('local')))
86 base.backup_simple(encrypt=True, finish=False, includes=['/usr/bin'])
87
88=== added directory 'tests/backup/encrypt-bin'
89=== added file 'tests/backup/encrypt-bin/duplicity'
90--- tests/backup/encrypt-bin/duplicity 1970-01-01 00:00:00 +0000
91+++ tests/backup/encrypt-bin/duplicity 2011-11-02 13:57:26 +0000
92@@ -0,0 +1,37 @@
93+#!/usr/bin/env python
94+# -*- Mode: Python; indent-tabs-mode: nil; tab-width: 2; coding: utf-8 -*-
95+#
96+# This file is part of Déjà Dup.
97+# For copyright information, see AUTHORS.
98+#
99+# Déjà Dup is free software; you can redistribute it and/or modify
100+# it under the terms of the GNU General Public License as published by
101+# the Free Software Foundation; either version 3 of the License, or
102+# (at your option) any later version.
103+#
104+# Déjà Dup is distributed in the hope that it will be useful, but
105+# WITHOUT ANY WARRANTY; without even the implied warranty of
106+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
107+# General Public License for more details.
108+#
109+# You should have received a copy of the GNU General Public License
110+# along with Déjà Dup. If not, see <http://www.gnu.org/licenses/>.
111+
112+# This file acts like a duplicity wrapper.
113+# It transforms any instances of "Extracting backup chains from list of files:"
114+# to "Translation:" (to help catch things like bug
115+# https://bugs.launchpad.net/deja-dup/+bug/877631)
116+
117+import os
118+import sys
119+import subprocess
120+
121+# Drop the PATH override that pointed to this script
122+os.environ['PATH'] = os.environ['PATH'].split(':', 1)[-1]
123+
124+extra_args = []
125+
126+p1 = subprocess.Popen(['duplicity'] + sys.argv[1:], stdout=subprocess.PIPE)
127+p2 = subprocess.Popen(["sed", "-s", "s/Extracting backup chains from list of files:/Translation:/g"], stdin=p1.stdout)
128+p1.stdout.close() # Allow p1 to receive a SIGPIPE if p2 exits.
129+p2.wait()
130
131=== modified file 'tests/base.py'
132--- tests/base.py 2011-08-30 18:57:19 +0000
133+++ tests/base.py 2011-11-02 13:57:26 +0000
134@@ -420,7 +420,7 @@
135
136 def walk_prefs(backend, dest, includes, excludes):
137 if backend == 'file':
138- ldtp.selectrow('frmBackup', 'tblCategories', 'Storage')
139+ ldtp.selecttab('frmBackup', 'ptlCategories', 'Storage')
140
141 if dest is None:
142 dest = get_temp_name('local')
143@@ -432,7 +432,7 @@
144 ldtp.settextvalue('frmBackup', 'txt0', dest) # FIXME txt0 is bad name
145 ldtp.wait(1) # without this, sometimes ldtp moves so fast, deja-dup doesn't notice dest
146
147- ldtp.selectrow('frmBackup', 'tblCategories', 'Folders')
148+ ldtp.selecttab('frmBackup', 'ptlCategories', 'Folders')
149 if includes is not None:
150 set_file_list('frmBackup', 'tblIncludeList', 'btnIncludeListAdd', 'btnIncludeListRemove', includes)
151 if excludes is not None:
152@@ -455,12 +455,13 @@
153
154 if guivisible('frmBackup', 'btnJustshowmybackupsettings'):
155 ldtp.click('frmBackup', 'btnJustshowmybackupsettings')
156+ remap('frmBackup')
157
158 if backend is not None or includes is not None or excludes is not None:
159 walk_prefs(backend=backend, dest=dest, includes=includes,
160 excludes=excludes)
161
162- ldtp.selectrow('frmBackup', 'tblCategories', 'Overview')
163+ ldtp.selecttab('frmBackup', 'ptlCategories', 'Overview')
164 ldtp.click('frmBackup', 'btnBackUpNow')
165 waitforgui('frmBackUp')
166
167@@ -483,7 +484,7 @@
168 if guivisible('frmBackup', 'btnIwanttorestorefilesfromapreviousbackup…'):
169 ldtp.click('frmBackup', 'btnIwanttorestorefilesfromapreviousbackup…')
170 else:
171- ldtp.selectrow('frmBackup', 'tblCategories', 'Overview')
172+ ldtp.selecttab('frmBackup', 'ptlCategories', 'Overview')
173 ldtp.click('frmBackup', 'btnRestore…')
174
175 waitforgui('frmRestore')
176@@ -492,7 +493,7 @@
177 walk_restore_prefs('frmRestore', backend, dest)
178 ldtp.click('frmRestore', 'btnForward')
179
180- wait_for_finish('frmRestore', 'lblRestorefromWhen?', 200)
181+ wait_for_finish('frmRestore', 'lblRestoreFromWhen?', 200)
182 if date:
183 ldtp.comboselect('frmRestore', 'cboDate', date)
184 ldtp.click('frmRestore', 'btnForward')
185@@ -528,7 +529,7 @@
186 walk_restore_prefs('frmRestore', backend=backend, dest=dest)
187 ldtp.click('frmRestore', 'btnForward')
188
189- wait_for_finish('frmRestore', 'lblRestorefromWhen?', 200)
190+ wait_for_finish('frmRestore', 'lblRestoreFromWhen?', 200)
191 if date:
192 ldtp.comboselect('frmRestore', 'cboDate', date)
193 ldtp.click('frmRestore', 'btnForward')

Subscribers

People subscribed via source and target branches