[Xsb-commits] CVS: XSB/packages/altCDF cdf_comps_share.P,1.9,1.10

[Terrance S. <ts...@us...>]

Update of /cvsroot/xsb/XSB/packages/altCDF
In directory sc8-pr-cvs1:/tmp/cvs-serv11618

Modified Files:
	cdf_comps_share.P 
Log Message:

Getting rid of minor conflicts, caused by variant formatting.


Index: cdf_comps_share.P
===================================================================
RCS file: /cvsroot/xsb/XSB/packages/altCDF/cdf_comps_share.P,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- cdf_comps_share.P	8 Oct 2003 13:58:06 -0000	1.9
+++ cdf_comps_share.P	8 Oct 2003 18:12:14 -0000	1.10
@@ -397,10 +397,11 @@
 		),
  		List),
 	member((V,New,Relnew,Vnew,DepType),List),
-        writeln(checking(dep(Name,New))),	
-	load_component_pass1(New,Relnew,AbsNew,version(Vnew),Arglist,depends),
-        assert_dependencies_for_path2(Name,New,AbsNew,Vnew),
-%% make sure dependencies store absolute filenames
+            writeln(checking(dep(Name,New))),	
+	load_component_pass1(New,Relnew,AbsNew,
+	                                   version(Vnew),Arglist,depends),
+           assert_dependencies_for_path2(Name,New,AbsNew,Vnew),
+           %% make sure dependencies store absolute filenames
 	retractallExtTerm(classHasAttr_ext(cid(component(cid(Name,Name),
 							 cid(Abs,cdfpt),
 							 cid(V,cdfpt)),Name),
@@ -475,10 +476,9 @@
 
 /* If check_component succeeds, we go ahead and do a pass 1 load. */
 check_component(Name,Path,V,Arglist,Flag):- 
-	(Flag == top
-	 ->	true
-	 ;	\+ system_component(Name)
-	),
+	(Flag == top -> true ; \+ system_component(Name)),
+	check_conflicting_path(Name,Path,Arglist),
+	check_conflicting_version(Name,Path,V),
 	(   already_present(Name,Path,V,Arglist)
 	->  %% cdf_warning(component, [Name, ' is already loaded.']),
 	    fail