summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rwxr-xr-xsmount.py11
-rwxr-xr-xsumount.py11
2 files changed, 8 insertions, 14 deletions
diff --git a/smount.py b/smount.py
index 28b9ec0..648c6e9 100755
--- a/smount.py
+++ b/smount.py
@@ -8,8 +8,7 @@ import sys
8 8
9 9
10def main(): 10def main():
11 """ 11 """Main entry point"""
12 """
13 if (len(sys.argv) != 2): 12 if (len(sys.argv) != 2):
14 sys.exit('Invalid parameter. Usage: {0} <mapping>\n'.format( 13 sys.exit('Invalid parameter. Usage: {0} <mapping>\n'.format(
15 sys.argv[0])) 14 sys.argv[0]))
@@ -28,11 +27,9 @@ def main():
28 args.extend([data['src'], data['dest']]) 27 args.extend([data['src'], data['dest']])
29 subprocess.check_call(args) 28 subprocess.check_call(args)
30 except subprocess.CalledProcessError as e: 29 except subprocess.CalledProcessError as e:
31 sys.stderr.write('Execution error: {0}\n'.format(e)) 30 print('Execution error: {0}'.format(e), file=sys.stderr, flush=True)
32 sys.stderr.flush() 31 except Exception:
33 except Exception as e: 32 print('Error: {0}'.format(cstm_error), file=sys.stderr, flush=True)
34 sys.stderr.write('Error: {0}\n'.format(cstm_error))
35 sys.stderr.flush()
36 33
37 34
38if __name__ == '__main__': 35if __name__ == '__main__':
diff --git a/sumount.py b/sumount.py
index 808b560..544047d 100755
--- a/sumount.py
+++ b/sumount.py
@@ -8,8 +8,7 @@ import sys
8 8
9 9
10def main(): 10def main():
11 """ 11 """Main entry point"""
12 """
13 if (len(sys.argv) != 2): 12 if (len(sys.argv) != 2):
14 sys.exit('Invalid parameter. Usage: {0} <mapping>\n'.format( 13 sys.exit('Invalid parameter. Usage: {0} <mapping>\n'.format(
15 sys.argv[0])) 14 sys.argv[0]))
@@ -48,11 +47,9 @@ def main():
48 '-u', 47 '-u',
49 data['dest']]) 48 data['dest']])
50 except subprocess.CalledProcessError as e: 49 except subprocess.CalledProcessError as e:
51 sys.stderr.write('Execution error: {0}\n'.format(e)) 50 print('Execution error: {0}'.format(e), file=sys.stderr, flush=True)
52 sys.stderr.flush() 51 except Exception:
53 except Exception as e: 52 print('Error: {0}'.format(cstm_error), file=sys.stderr, flush=True)
54 sys.stderr.write('Error: {0}\n'.format(cstm_error))
55 sys.stderr.flush()
56 53
57 54
58if __name__ == '__main__': 55if __name__ == '__main__':