Merge branch 'branch-4.2' into better_safe_snap

install

@@ -60,6 +60,7 @@ if test -e $TARGET; then
 fi
 
 mkdir -p $TARGET/{bin,scripts,logs}
+mkdir -p $RTCDS/chans/tmp
 chmod 775 $TARGET/logs
 mkdir -p $TARGET/${system}epics/burt
 if [ -e $RTCDS/target_archive/${system}/${system}_$cur_date/${system}epics/burt ]; then

src/epics/util/lib/IPCmonitor.pm

 package CDS::IPCmonitor;
 use Exporter;
+use File::Path;
 @ISA = ('Exporter');
 
 #//	\page IPCx IPCx.pm
@@ -227,11 +228,17 @@ my @ipcxMaxNum = (-999,-999,-999,-999);
 
    # Develop name of IPC parameter file based on return from above.
         #my ($i) = @_;
-	my $iFile = $::target;
-	$iFile .= "/chans/ipc/";
-	$iFile .= $::ifo;
-	$iFile .= "\.ipc";
+        my $iFilePath =  $::target;
+	$iFilePath .= "/chans/ipc/";
+	my $iFile .= $iFilePath . $::ifo;
+        $iFile .= "\.ipc";
    # Open and input data from IPC parameter file
+   File::Path::make_path($iFilePath);
+   unless (-e $iFile)
+   {
+   	open(TOUCH, ">>$iFile");
+   	close(TOUCH);
+   }
    open(IPCIN, "<$iFile") || die "***ERROR: IPCx parameter file $iFile not found\n";
    chomp(@inData=<IPCIN>);
    close IPCIN;

src/epics/util/lib/IPCx.pm

 package CDS::IPCx;
 use Exporter;
+use File::Path;
 @ISA = ('Exporter');
 
 #//	\page IPCx IPCx.pm
@@ -331,12 +332,18 @@ if ($::ipcxCnt > 0) {
 
 
    # Develop name of IPC parameter file based on return from above.
-        #my ($i) = @_;
-	my $iFile = $::target;
-	$iFile .= "/chans/ipc/";
-	$iFile .= $::ifo;
-	$iFile .= "\.ipc";
+     #my ($i) = @_;
+     my $iFilePath =  $::target;
+     $iFilePath .= "/chans/ipc/";
+     my $iFile .= $iFilePath . $::ifo;
+     $iFile .= "\.ipc";
    # Open and input data from IPC parameter file
+   File::Path::make_path($iFilePath);
+   unless (-e $iFile)
+   {
+     open(TOUCH, ">>$iFile");
+     close(TOUCH);
+   }
    open(IPCIN, "<$iFile") || die "***ERROR: IPCx parameter file $iFile not found\n";
    chomp(@inData=<IPCIN>);
    close IPCIN;