Web   ·   Wiki   ·   Activities   ·   Blog   ·   Lists   ·   Chat   ·   Meeting   ·   Bugs   ·   Git   ·   Translate   ·   Archive   ·   People   ·   Donate
summaryrefslogtreecommitdiffstats
path: root/debian/patches/1005_avoid_check_call.patch
blob: 25547dc2380eb6efe7d6567fbc28fadf73b924f9 (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
diff --git a/src/olpc/datastore/bin_copy.py b/src/olpc/datastore/bin_copy.py
index 6cf7036..3440b1b 100644
--- a/src/olpc/datastore/bin_copy.py
+++ b/src/olpc/datastore/bin_copy.py
@@ -2,15 +2,13 @@ import os, subprocess
 
 
 def bin_copy(src, dest):
-    try:
-        subprocess.check_call(['/bin/cp', src, dest])
-    except subprocess.CalledProcessError:
+    retcode = subprocess.call(['/bin/cp', src, dest])
+    if retcode:
         raise OSError("Copy failed %s %s" % (src, dest))
 
 def bin_mv(src, dest):
-    try:
-        subprocess.check_call(['/bin/mv', src, dest])
-    except subprocess.CalledProcessError:
+    retcode = subprocess.call(['/bin/mv', src, dest])
+    if retcode:
         raise OSError("Move failed %s %s" % (src, dest))
 
 if __name__ == "__main__":