Subversion Repositories DevTools

Rev

Rev 153 | Show entire file | Ignore whitespace | Details | Blame | Last modification | View Log | RSS feed

Rev 153 Rev 183
Line 233... Line 233...
233
End Function
233
End Function
234
 
234
 
235
'--------------------------------------------------------------------------------------------
235
'--------------------------------------------------------------------------------------------
236
' Daemon Instruction validation function
236
' Daemon Instruction validation function
237
'--------------------------------------------------------------------------------------------
237
'--------------------------------------------------------------------------------------------
238
Function HandleValidateDaemonInstructionError(nOpCode, retERRmsg)
238
Function HandleValidateDaemonInstructionError(nOpCode, retERRmsg, ByRef sErrorMsg)
239
   Dim s
239
   Dim s
240
 
240
 
241
   s = ""
241
   s = ""
242
 
242
 
243
   HandleValidateDaemonInstructionError = True
243
   HandleValidateDaemonInstructionError = True
Line 270... Line 270...
270
            s = "Some dependencies of this package are still not released. Release them first before trying to add a daemon instruction to this package."
270
            s = "Some dependencies of this package are still not released. Release them first before trying to add a daemon instruction to this package."
271
         Case Else
271
         Case Else
272
            s = "Correct any errors in the release notes, and try again."
272
            s = "Correct any errors in the release notes, and try again."
273
         End Select
273
         End Select
274
 
274
 
275
         ' redirect to an error
-
 
276
         CloseWindow
-
 
277
         Call RaiseMsgInParent ( enum_WMSG_ERROR, "Cannot add this daemon instruction<br><br>" & s)
275
         sErrorMsg = "Cannot add this daemon instruction<br><br>" & s
278
 
276
 
279
         HandleValidateDaemonInstructionError = False
277
         HandleValidateDaemonInstructionError = False
280
      End If
278
      End If
281
   End If
279
   End If
282
 
280
 
Line 286... Line 284...
286
   Dim retERRmsg
284
   Dim retERRmsg
287
   Dim retALRTmsg
285
   Dim retALRTmsg
288
   Dim retParameters
286
   Dim retParameters
289
   Dim pkgType
287
   Dim pkgType
290
   Dim s
288
   Dim s
291
 
-
 
-
 
289
   Dim sErrorMsg
292
   s = ""
290
   s = ""
293
   pkgType = 0
291
   pkgType = 0
294
 
292
 
295
   ValidateDaemonInstruction = True
293
   ValidateDaemonInstruction = True
296
 
294
 
Line 304... Line 302...
304
      Call CheckRequirementsForMakePending ( nPv_id, nRtag_id, pkgType, retERRmsg, retALRTmsg, retParameters )
302
      Call CheckRequirementsForMakePending ( nPv_id, nRtag_id, pkgType, retERRmsg, retALRTmsg, retParameters )
305
      If IsNull(retERRmsg) Then
303
      If IsNull(retERRmsg) Then
306
         ' Check broken dependencies, missing dependencies, unofficial dependencies, bad package info, reason for version, unit test
304
         ' Check broken dependencies, missing dependencies, unofficial dependencies, bad package info, reason for version, unit test
307
         Call CheckRequirementsForMakeRelease( nPv_id, nRtag_id, pkgType, retERRmsg, retALRTmsg, retParameters )
305
         Call CheckRequirementsForMakeRelease( nPv_id, nRtag_id, pkgType, retERRmsg, retALRTmsg, retParameters )
308
      End If
306
      End If
309
      ValidateDaemonInstruction = HandleValidateDaemonInstructionError(nOpCode,retERRmsg)
307
      ValidateDaemonInstruction = HandleValidateDaemonInstructionError(nOpCode,retERRmsg,sErrorMsg)
310
 
308
 
-
 
309
      If Not ValidateDaemonInstruction Then
-
 
310
        Call RaiseMsg(enum_MSG_ERROR, sErrorMsg)
-
 
311
      End If
311
   Case OP_CODE_1_TEST_BUILD_PACKAGE
312
   Case OP_CODE_1_TEST_BUILD_PACKAGE
312
      ValidateDaemonInstruction = True ' no validation checks for this instruction
313
      ValidateDaemonInstruction = True ' no validation checks for this instruction
313
 
314
 
314
   Case Else
315
   Case Else
315
      CloseWindow
-
 
316
      Call RaiseMsgInParent(enum_MSG_ERROR, "Attempt to add an unknown daemon instruction")
316
      Call RaiseMsg(enum_MSG_ERROR, "Attempt to add an unknown daemon instruction")
317
      ValidateDaemonInstruction = False
317
      ValidateDaemonInstruction = False
318
   End Select
318
   End Select
319
End Function
319
End Function
320
'------------------------------------------------------------------------------------------------------------------------------------------
320
'------------------------------------------------------------------------------------------------------------------------------------------
321
Function DaemonInstructionPreventsEditing(nRtag_id, nPv_id)
321
Function DaemonInstructionPreventsEditing(nRtag_id, nPv_id)