OpenVista/GT.M Integration

Merge lp:~jontai/openvista-gtm-integration/bug408994 into lp:openvista-gtm-integration

  1. bug408994
  2. Merge into mainline
Proposed by Jon Tai
Status: Merged
Merged at revision: not available
Proposed branch: lp:~jontai/openvista-gtm-integration/bug408994
Merge into: lp:openvista-gtm-integration
Diff against target: None lines
To merge this branch: bzr merge lp:~jontai/openvista-gtm-integration/bug408994
Reviewer Review Type Date Requested Status
jeff.apple Approve
Review via email: mp+9668@code.launchpad.net
To post a comment you must log in.
Revision history for this message
jeff.apple (jeff-apple) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'scripts/usr/bin/ovbackup'
2--- scripts/usr/bin/ovbackup 2009-07-17 08:17:11 +0000
3+++ scripts/usr/bin/ovbackup 2009-08-04 21:05:22 +0000
4@@ -200,8 +200,8 @@
5 print_status "ovbackup" "Backup of $instance written to $root/$instance/backups/${instance}-$timestamp.tar.bz2" "$skip_status"
6
7 # remove the oldest backup file until there are only $num_backups remaining
8-until [ `find "$root/$instance/backups" -type f -name "*.tar.bz2" | wc -l` -le $num_backups ]; do
9- delete=`find "$root/$instance/backups" -type f -name "*.tar.bz2" | sort | head -n 1`
10+until [ `find "$root/$instance/backups/" -type f -name "*.tar.bz2" | wc -l` -le $num_backups ]; do
11+ delete=`find "$root/$instance/backups/" -type f -name "*.tar.bz2" | sort | head -n 1`
12 rm -f "$delete" "$delete.md5"
13 logger -p user.info -t "ovbackup[$$]" -- Deleted old backup $delete
14 done
15
16=== modified file 'scripts/usr/bin/ovimport'
17--- scripts/usr/bin/ovimport 2009-07-17 08:17:11 +0000
18+++ scripts/usr/bin/ovimport 2009-08-04 21:05:22 +0000
19@@ -104,7 +104,7 @@
20 }
21 fi
22
23-if [ -n "`find \"$root/$instance/routines\" -type f -name '*.m' -print -quit`" ]; then
24+if [ -n "`find \"$root/$instance/routines/\" -type f -name '*.m' -print -quit`" ]; then
25 $force || {
26 echo "ovimport: $instance: OpenVista instance is not new; use -f to force"
27 exit 1
28@@ -132,7 +132,7 @@
29 routines_convert_newlines=true
30 fi
31 elif [ -d "$routines" ]; then
32- if [ -n "`find \"$routines\" -type f -name '*.m' -print -quit`" ]; then
33+ if [ -n "`find \"$routines/\" -type f -name '*.m' -print -quit`" ]; then
34 routines_format="M"
35 else
36 echo "ovimport: $routines: Directory does not contain .m files" >&2
37@@ -230,7 +230,7 @@
38 (
39 umask 007
40 cd "$root/$instance/objects" &&
41- find "$root/$instance/routines" -type f -name '*.m' -exec mumps {} \; 2> /dev/null
42+ find "$root/$instance/routines/" -type f -name '*.m' -exec mumps {} \; 2> /dev/null
43 ) || exit_with_error "ovimport" "Unable to compile routines"
44
45 print_status "ovimport" "Finished loading $routines into $instance" "$skip_status"
46
47=== modified file 'scripts/usr/bin/ovpurgejournals'
48--- scripts/usr/bin/ovpurgejournals 2009-07-17 08:17:11 +0000
49+++ scripts/usr/bin/ovpurgejournals 2009-08-04 21:05:22 +0000
50@@ -82,8 +82,8 @@
51 esac
52
53 # remove the oldest journal file until there are only $num_journals remaining
54-until [ `find "$root/$instance/journals" -type f -name "default.mjl_*" | wc -l` -le $num_journals ]; do
55- delete=`find "$root/$instance/journals" -type f -name "default.mjl_*" | sort | head -n 1`
56+until [ `find "$root/$instance/journals/" -type f -name "default.mjl_*" | wc -l` -le $num_journals ]; do
57+ delete=`find "$root/$instance/journals/" -type f -name "default.mjl_*" | sort | head -n 1`
58 rm -f "$delete"
59 logger -p user.info -t "ovpurgejournals[$$]" -- Deleted old journal $delete
60 done
61
62=== modified file 'scripts/usr/sbin/ovrestore'
63--- scripts/usr/sbin/ovrestore 2009-07-17 08:17:11 +0000
64+++ scripts/usr/sbin/ovrestore 2009-08-04 21:05:22 +0000
65@@ -198,8 +198,8 @@
66
67 {
68 chown -R root:"$user" "$tempdir/routines" &&
69- find "$tempdir/routines" -type f -name '*.m' -exec chmod 660 {} \; &&
70- find "$tempdir/routines" -type d -exec chmod 2770 {} \; &&
71+ find "$tempdir/routines/" -type f -name '*.m' -exec chmod 660 {} \; &&
72+ find "$tempdir/routines/" -type d -exec chmod 2770 {} \; &&
73 rsync -a --delete --exclude 'lost+found' "$tempdir/routines/" "$root/$instance/routines/"
74 } || exit_with_error "ovrestore" "Unable to restore routines"
75
76@@ -207,9 +207,9 @@
77
78 (
79 umask 007
80- find "$root/$instance/objects" -type f -name '*.o' -exec rm -f {} \; &&
81+ find "$root/$instance/objects/" -type f -name '*.o' -exec rm -f {} \; &&
82 cd "$root/$instance/objects" &&
83- find "$root/$instance/routines" -type f -name '*.m' -exec mumps {} \; 2> /dev/null
84+ find "$root/$instance/routines/" -type f -name '*.m' -exec mumps {} \; 2> /dev/null
85 ) || exit_with_error "ovrestore" "Unable to compile routines"
86
87 # if we're not applying journals, shut off journaling on the old database so

Subscribers

People subscribed via source and target branches