coren has submitted this change and it was merged.
Change subject: Tool Labs: support some non-work prefixes in crontabs
......................................................................
Tool Labs: support some non-work prefixes in crontabs
Change-Id: If1fdbbdfaa1ae48def1837d1f9913e49b5ebaa17
---
M modules/toollabs/files/crontab
1 file changed, 7 insertions(+), 2 deletions(-)
Approvals:
coren: Looks good to me, approved
jenkins-bot: Verified
diff --git a/modules/toollabs/files/crontab b/modules/toollabs/files/crontab
index ce62d56..6e7767f 100755
--- a/modules/toollabs/files/crontab
+++ b/modules/toollabs/files/crontab
@@ -146,9 +146,14 @@
foreach my $line (@crontab) {
if($line =~
m/^([^#]\S*\s+\S+\s+\S+\s+\S+\s+\S+\s+|\@\S+\s+)(\S+)([^#\n]*)(#.*)?\n?$/) {
$crlino++;
+ my $prefix = '';
+ if($cmd =~ m/^\s*(cd\s+\S+|\[[^]]*\])\s*\&\&\s*(.*)/) {
+ $prefix = "$1 && ";
+ $cmd = $2;
+ }
my($sched, $cmd, $args, $cmt) = ($1, $2, $3, $4);
- unless($cmd =~ m[^(/usr/(local/)?bin/)?(jsub|jstart|jmail|qsub)$])
{
- $args = "$cmd $args";
+ unless($cmd =~
m[^(/usr/(local/)?bin/)?(jsub|jstart|jmail|qsub|jlocal)$]) {
+ $args = "$prefix$cmd $args";
$cmd = "/usr/bin/jsub -N cron-$uname-$crlino -once -quiet";
$modified = 1;
$line = "$sched $cmd $args";
--
To view, visit https://gerrit.wikimedia.org/r/130825
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: If1fdbbdfaa1ae48def1837d1f9913e49b5ebaa17
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: coren <mpellet...@wikimedia.org>
Gerrit-Reviewer: coren <mpellet...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
