Subversion Repositories DevTools

Rev

Rev 5506 | Go to most recent revision | Show entire file | Ignore whitespace | Details | Blame | Last modification | View Log | RSS feed

Rev 5506 Rev 5898
Line 139... Line 139...
139
      If (rsQry.Fields("operation") = op) Then
139
      If (rsQry.Fields("operation") = op) Then
140
         PRIVATE_Is_A_Valid_Pending_Merge = TRUE
140
         PRIVATE_Is_A_Valid_Pending_Merge = TRUE
141
		Else
141
		Else
142
         PRIVATE_Is_A_Valid_Pending_Merge = FALSE
142
         PRIVATE_Is_A_Valid_Pending_Merge = FALSE
143
		End If
143
		End If
-
 
144
 
-
 
145
      ' If an additive operation, then prevent Unbuildable packages being processed
-
 
146
      If op = "A" Then
-
 
147
          If rsQry.Fields("build_type") = "U" Then
-
 
148
            PRIVATE_Is_A_Valid_Pending_Merge = FALSE
-
 
149
          End If
-
 
150
      End If
-
 
151
 
144
   Else
152
   Else
145
      PRIVATE_Is_A_Valid_Pending_Merge = FALSE
153
      PRIVATE_Is_A_Valid_Pending_Merge = FALSE
146
   End If
154
   End If
147
 
155
 
148
   OraDatabase.Parameters.Remove "PV_ID"
156
   OraDatabase.Parameters.Remove "PV_ID"
Line 607... Line 615...
607
 
615
 
608
   ' free dictionaries
616
   ' free dictionaries
609
   Set pkgIdsAndCounts = nothing
617
   Set pkgIdsAndCounts = nothing
610
   Set pkgIdsAndPvIds = nothing
618
   Set pkgIdsAndPvIds = nothing
611
 
619
 
612
   ' Now process each new and valid Auto/Manaul build item in the string array
620
   ' Now process each new and valid Auto/Manual build item in the string array
613
   RaiseWIPExists = FALSE
621
   RaiseWIPExists = FALSE
614
   For Each pvId In remainingList3
622
   For Each pvId In remainingList3
615
      Call PUBLIC_ApproveRelease(NNrtag_id, pvId, retParameters, TRUE)
623
      Call PUBLIC_ApproveRelease(NNrtag_id, pvId, retParameters, TRUE)
616
   Next
624
   Next
617
   If ( RaiseWIPExists = TRUE ) Then
625
   If ( RaiseWIPExists = TRUE ) Then