Side by Side Diff: sitescripts/subscriptions/bin/updateMalwareDomainsList.py
Issue 10942098:
Make sure subprocess calls don`t ignore result codes indicating errors. Fix JS docs generation whil… (Closed)
Patch Set:
Created July 8, 2013, 9:03 a.m.
| Left: | ||
| Right: |
Use n/p to move between diff chunks;
N/P to move between comments.
« no previous file with comments
|
« no previous file
|
no next file »
|
no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')
| OLD | NEW |
|---|---|
| 1 # coding: utf-8 | 1 # coding: utf-8 |
| 2 | 2 |
| 3 # This file is part of the Adblock Plus web scripts, | 3 # This file is part of the Adblock Plus web scripts, |
| 4 # Copyright (C) 2006-2013 Eyeo GmbH | 4 # Copyright (C) 2006-2013 Eyeo GmbH |
| 5 # | 5 # |
| 6 # Adblock Plus is free software: you can redistribute it and/or modify | 6 # Adblock Plus is free software: you can redistribute it and/or modify |
| 7 # it under the terms of the GNU General Public License version 3 as | 7 # it under the terms of the GNU General Public License version 3 as |
| 8 # published by the Free Software Foundation. | 8 # published by the Free Software Foundation. |
| 9 # | 9 # |
| 10 # Adblock Plus is distributed in the hope that it will be useful, | 10 # Adblock Plus is distributed in the hope that it will be useful, |
| (...skipping 31 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 42 zip = zipfile.ZipFile(StringIO(data), 'r') | 42 zip = zipfile.ZipFile(StringIO(data), 'r') |
| 43 info = zip.infolist()[0] | 43 info = zip.infolist()[0] |
| 44 for line in str(zip.read(info.filename)).splitlines(): | 44 for line in str(zip.read(info.filename)).splitlines(): |
| 45 if not line: | 45 if not line: |
| 46 continue | 46 continue |
| 47 print >>file, '||%s^' % line.strip().decode('iso-8859-1') | 47 print >>file, '||%s^' % line.strip().decode('iso-8859-1') |
| 48 file.close(); | 48 file.close(); |
| 49 | 49 |
| 50 if subprocess.check_output(['hg', 'stat', '-R', tempdir]) != '': | 50 if subprocess.check_output(['hg', 'stat', '-R', tempdir]) != '': |
| 51 subprocess.check_call(['hg', '-q', 'commit', '-R', tempdir, '-A', '-u', 'h gbot', '-m', 'Updated malwaredomains.com data']) | 51 subprocess.check_call(['hg', '-q', 'commit', '-R', tempdir, '-A', '-u', 'h gbot', '-m', 'Updated malwaredomains.com data']) |
| 52 subprocess.call(['hg', '-q', 'push', '-R', tempdir]) | 52 subprocess.check_call(['hg', '-q', 'push', '-R', tempdir]) |
| 53 finally: | 53 finally: |
| 54 shutil.rmtree(tempdir, ignore_errors=True) | 54 shutil.rmtree(tempdir, ignore_errors=True) |
| OLD | NEW |
« no previous file with comments
|
« no previous file
|
no next file »
|
no next file with comments »
