projects
/
fusionforge
/
fusionforge.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
project home
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
83af861
)
Canonicalize file names when displaying them
author
Roland Mas
<lolando@debian.org>
Wed, 1 Aug 2012 14:05:12 +0000
(14:05 +0000)
committer
Roland Mas
<lolando@debian.org>
Wed, 1 Aug 2012 14:05:12 +0000
(14:05 +0000)
src/db/upgrade-db.php
patch
|
blob
|
history
diff --git
a/src/db/upgrade-db.php
b/src/db/upgrade-db.php
index 548f4ea321ac6243378069e8e87c902c802b00b8..ce1535cc8ade2d3c45aded28785830e4dde6be01 100755
(executable)
--- a/
src/db/upgrade-db.php
+++ b/
src/db/upgrade-db.php
@@
-143,10
+143,10
@@
function run_script($script) {
if (count($result)) { // the script produced an output
if ($result[count($result)-1] == 'SUCCESS') {
if (count($result)) { // the script produced an output
if ($result[count($result)-1] == 'SUCCESS') {
- show(
$db_path.$filename
." ran correctly\n\n");
+ show(
realpath($db_path.$filename)
." ran correctly\n\n");
$return = true;
} else {
$return = true;
} else {
- show(
$db_path.$filename
." FAILED!\n\n");
+ show(
realpath($db_path.$filename)
." FAILED!\n\n");
show("Script output follows:\n");
foreach ($result as $line) {
show($line."\n");
show("Script output follows:\n");
foreach ($result as $line) {
show($line."\n");
@@
-154,7
+154,7
@@
function run_script($script) {
show("[End of script output]\n");
}
} else {
show("[End of script output]\n");
}
} else {
- show(
$db_path.$filename
." FAILED!\n\n");
+ show(
realpath($db_path.$filename)
." FAILED!\n\n");
}
} else if ($ext == 'sql') {
}
} else if ($ext == 'sql') {
@@
-167,10
+167,10
@@
echo "\nskipping $filename";
// run the sql script
$queries = array();
if (run_sql_script($filename)) {
// run the sql script
$queries = array();
if (run_sql_script($filename)) {
- show(
$db_path.$filename
." ran correctly\n\n");
+ show(
realpath($db_path.$filename)
." ran correctly\n\n");
$return = true;
} else {
$return = true;
} else {
- show(
$db_path.$filename
." FAILED!\n\n");
+ show(
realpath($db_path.$filename)
." FAILED!\n\n");
}
}
} else {
}
}
} else {