projects
/
Pman.Core
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
move check after cached version
[Pman.Core]
/
JsCompile.php
diff --git
a/JsCompile.php
b/JsCompile.php
index
71d6ba7
..
4b10168
100644
(file)
--- a/
JsCompile.php
+++ b/
JsCompile.php
@@
-230,17
+230,8
@@
class Pman_Core_JsCompile extends Pman
// if packer is running, then dont compile - just output onebyone...
// if packer is running, then dont compile - just output onebyone...
- require_once 'System.php';
- $pg = System::which('pgrep');
- $cmd = "$pg roobuilder";
- $out = trim(`$cmd`);
- if (strlen($out) > 0) {
- return false;
- }
-
-
-
+ require_once 'System.php';
$packer = System::which('roojspacker');
$packer = System::which('roojspacker');
@@
-261,6
+252,17
@@
class Pman_Core_JsCompile extends Pman
return true;
}
return true;
}
+
+
+ $pg = System::which('pgrep');
+ $cmd = "$pg roobuilder";
+ $out = trim(`$cmd`);
+ if (strlen($out) > 0) {
+ echo '<!-- onther process is compiling compile. -->';
+ return false;
+ }
+
+
if (file_exists($output)) {
unlink($output);
}
if (file_exists($output)) {
unlink($output);
}