Re: [Tails-dev] first patch attempt

Nachricht löschen

Nachricht beantworten
Autor: intrigeri
Datum:  
To: The Tails public development discussion list
Betreff: Re: [Tails-dev] first patch attempt
Hi Sina,

Sina S wrote (03 Oct 2013 13:45:23 GMT) :
> Sorry for the slow reply on this.


No problem, we're not in a hurry :)

> I completed the live patch test and it was successful at skipping the iso
> file.
> [...]
> 6. Before clicking "Next" I filled the disk with a 800MB zerofile. As
> expected the clone failed.
> 7. I renamed the file to end with .iso
> 8. Reran the "Clone and Upgrade" which completed successfully.


Cool, thanks for testing.

I've then applied your patch to our liveusb-creator master Git branch,
with the additional one on top of it:

--- a/liveusb/source.py
+++ b/liveusb/source.py
@@ -89,7 +89,12 @@ class RunningLiveSystemSource(Source):
             src = os.path.join(self.path, f)
             dst = os.path.join(destination, f)
             if os.path.isfile(src):
-                if not src.lower().endswith('.iso'): shutil.copy(src, dst)
+                if src.lower().endswith('.iso'):
+                    print >> sys.stderr, _("Skipping '%(filename)s'" % {
+                        'filename': src
+                    })
+                else:
+                    shutil.copy(src, dst)
             elif os.path.islink(src):
                 linkto = os.readlink(src)
                 os.symlink(linkto, dst)


I've tested the result, works fine for me, should be in Tails 0.21.
Congrats! :)

Want me to find another ticket you could tackle, or do you prefer
looking by yourself first?

Cheers,
--
intrigeri
| GnuPG key @ https://gaffer.ptitcanardnoir.org/intrigeri/intrigeri.asc
| OTR fingerprint @ https://gaffer.ptitcanardnoir.org/intrigeri/otr.asc