--- a/oi-releng-richlowe-pkg5-import-hacks	Fri Nov 19 00:11:01 2010 +0000
+++ b/oi-releng-richlowe-pkg5-import-hacks	Fri Nov 19 01:18:17 2010 +0000
@@ -1903,28 +1903,13 @@
 diff --git a/src/util/distro-import/Makefile b/src/util/distro-import/Makefile
 --- a/src/util/distro-import/Makefile
 +++ b/src/util/distro-import/Makefile
-@@ -43,16 +43,32 @@
-             /net/paradise.sfbay/export/integrate_dock/nv/$(NONWOS_DOCK)/$(ARCH)
- 
- TEST_PKGS=
--REPO=http://localhost:10000
--ON_REPO=http://localhost:20000
--INSTALL_REPO=http://localhost:20001
--X_REPO=http://localhost:20002
--IPS_REPO=http://localhost:20003
-+REPO=file:///stash/pkg/ossnap_$(BUILDID)
-+ON_REPO=file:///builds/work/onnv/onnv-build/packages/i386/nightly-nd/repo.redist
-+INSTALL_REPO=file:///builds/work/os-snap/os-snap_$(BUILDID)/caiman_$(BUILDID)/packages/i386/nightly-nd/repo.redist
-+IPS_REPO=file:///builds/work/os-snap/os-snap_$(BUILDID)/pkg_$(BUILDID)/packages/i386/repo
-+X_REPO=file:///builds/work/xnv/xnv-ips/proto/pkg_i386
- 
+@@ -53,7 +53,22 @@
  BUILDID_NORESPIN=/usr/bin/echo $(BUILDID) | sed -e 's/\([0-9]\)[a-z]*$$/\1/g'
  
--REF_REPO=http://ipkg.sfbay/release
+ REF_REPO=http://ipkg.sfbay/release
 -REF_URIS=$(REF_REPO)@[email protected],5.11-0.$(BUILDID_NORESPIN:sh)
-+REF_REPO=file:///stash/pkg/redist_134
 +REF_URIS=$(REF_REPO)@consolidation/solaris_re/[email protected],5.11-0.134 \
-+	$(REF_REPO)@consolidation/vpanels/[email protected],5.11-0.134 \
++	$(REF_REPO)@consolidation/vpanels/[email protected],5.11-0.134 \
 +	$(REF_REPO)@consolidation/nspg/[email protected] \
 +	$(REF_REPO)@consolidation/sunpro/[email protected] \
 +	$(REF_REPO)@consolidation/hcts/[email protected] \
@@ -1939,11 +1924,10 @@
 +	$(REF_REPO)@consolidation/cns/[email protected] \
 +	$(REF_REPO)@consolidation/dbtg/[email protected] \
 +	$(REF_REPO)@consolidation/xvm/[email protected]
-+
  
  JUST_THESE_PKGS=
  EXTRA_ENTIRE_CONTENTS=
-@@ -824,6 +840,18 @@
+@@ -838,6 +853,18 @@
  	$(SOLARIS.PY) -s $(REPO) -w $(WOS_PKGS) $(ELIDED_FILES:%=-D %) \
  		$(INCLUDE_PATH_$(BUILDID):%=-I %) $(BUILDID)/all.i386
  
@@ -1965,22 +1949,7 @@
 diff --git a/src/util/publish/Makefile b/src/util/publish/Makefile
 --- a/src/util/publish/Makefile
 +++ b/src/util/publish/Makefile
-@@ -22,15 +22,17 @@
- # Use is subject to license terms.
- #
- ARCH:sh=	uname -p
--REPO=http://localhost:10000
--ON_REPO=http://localhost:20000
--INSTALL_REPO=http://localhost:20001
--X_REPO=http://localhost:20002
--IPS_REPO=http://localhost:20003
-+REPO=file:///stash/pkg/ossnap_$(BUILDID)
-+ON_REPO=file:///builds/work/onnv/onnv-build/packages/i386/nightly-nd/repo.redist
-+INSTALL_REPO=file:///builds/work/os-snap/os-snap_$(BUILDID)/caiman_$(BUILDID)/packages/i386/nightly-nd/repo.redist
-+IPS_REPO=file:///builds/work/os-snap/os-snap_$(BUILDID)/pkg_$(BUILDID)/packages/i386/repo
-+X_REPO=file:///builds/work/xnv/xnv-ips/proto/pkg_i386
-+
- MERGEDIR=../../../proto/merge
+@@ -34,6 +34,7 @@
  SETPUBLISHERDIR=../../../proto/set-publisher
  PROTO=../../../proto/root_$(ARCH)
  PYTHONPATH=$(PROTO)/usr/lib/python2.6/vendor-packages
@@ -1988,31 +1957,14 @@
  SPARC_REPO=http://localhost:10001
  i386_REPO=http://localhost:10002
  EXTRA_ARGS=
-@@ -57,7 +59,7 @@
- 	do PYTHONPATH=$(PYTHONPATH) ./pkg_publish $(MERGEDIR)/$$var $(REPO); done
+@@ -59,6 +60,7 @@
+ publish: $(MERGEDIR)
+ 	for var in `(cd $(MERGEDIR); echo * )`; do \
+ 		PYTHONPATH=$(PYTHONPATH) \
++		PATH=$(PKGPATH):$$PATH \
+ 		    ./pkg_publish $(MERGEDIR)/$$var $(REPO); \
+ 	done
  
- publish_setpublisher: $(SETPUBLISHERDIR)
--	PYTHONPATH=$(PYTHONPATH) ./set-publisher.sh -b $(BUILDID) \
-+	PYTHONPATH=$(PYTHONPATH) PATH=$(PKGPATH):$$PATH ./set-publisher.sh -b $(BUILDID) \
- 		-d $(SETPUBLISHERDIR) -p $(REPO) \
- 		$(ON_REPO) \
- 		$(INSTALL_REPO) \
-diff --git a/src/util/publish/set-publisher.sh b/src/util/publish/set-publisher.sh
---- a/src/util/publish/set-publisher.sh
-+++ b/src/util/publish/set-publisher.sh
-@@ -59,9 +59,9 @@
- done
- shift $(expr $OPTIND - 1)
- 
--if [[ -z $only_this_build || -z $recv_dir || -z $publish_repo ]]; then
--	echo "one of the options not specified."
--	print "Usage: $0: -b build -d directory -p publish_repo input_repos" 
-+if [[ -z $recv_dir || -z $publish_repo ]]; then
-+	echo "one of the mandatory options was not specified."
-+	print "Usage: $0: [-b build] -d directory -p publish_repo input_repos" 
- 	exit 2
- fi
- if [ ! -d $recv_dir ]; then
 diff --git a/src/util/publish/set-publisher.transforms b/src/util/publish/set-publisher.transforms
 --- a/src/util/publish/set-publisher.transforms
 +++ b/src/util/publish/set-publisher.transforms