Fix other files which refer to private elisp symbols

emacs-berlin · Jun 4, 2015 · 71d43d1 · 71d43d1
1 parent 9191433
commit 71d43d1
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 10 deletions.
diff --git a/Makefile b/Makefile
@@ -68,16 +68,16 @@ packages/archive-contents: $(PKGDIR)/*.entry
 	$(EVAL) '(package-build-dump-archive-contents)'
 
 cleanup:
-	$(EVAL) '(let ((package-build-stable $(STABLE)) (package-build-archive-dir (expand-file-name "$(PKGDIR)/" pb/this-dir))) (package-build-cleanup))'
+	$(EVAL) '(let ((package-build-stable $(STABLE)) (package-build-archive-dir (expand-file-name "$(PKGDIR)/" package-build--this-dir))) (package-build-cleanup))'
 
 ## Json rules
 html/archive.json: $(PKGDIR)/archive-contents
 	@echo " • Building $@ ..."
-	$(EVAL) '(let ((package-build-stable $(STABLE)) (package-build-archive-dir (expand-file-name "$(PKGDIR)/" pb/this-dir))) (package-build-archive-alist-as-json "html/archive.json"))'
+	$(EVAL) '(let ((package-build-stable $(STABLE)) (package-build-archive-dir (expand-file-name "$(PKGDIR)/" package-build--this-dir))) (package-build-archive-alist-as-json "html/archive.json"))'
 
 html/recipes.json: $(RCPDIR)/.dirstamp
 	@echo " • Building $@ ..."
-	$(EVAL) '(let ((package-build-stable $(STABLE)) (package-build-archive-dir (expand-file-name "$(PKGDIR)/" pb/this-dir))) (package-build-recipe-alist-as-json "html/recipes.json"))'
+	$(EVAL) '(let ((package-build-stable $(STABLE)) (package-build-archive-dir (expand-file-name "$(PKGDIR)/" package-build--this-dir))) (package-build-recipe-alist-as-json "html/recipes.json"))'
 
 json: html/archive.json html/recipes.json
 
@@ -90,7 +90,7 @@ $(RCPDIR)/.dirstamp: .FORCE
 $(RCPDIR)/%: .FORCE
 	@echo " • Building recipe $(@F) ..."
 
-	- $(TIMEOUT) $(EVAL) "(let ((package-build-stable $(STABLE)) (package-build-write-melpa-badge-images t) (package-build-archive-dir (expand-file-name \"$(PKGDIR)\" pb/this-dir))) (package-build-archive '$(@F)))"
+	- $(TIMEOUT) $(EVAL) "(let ((package-build-stable $(STABLE)) (package-build-write-melpa-badge-images t) (package-build-archive-dir (expand-file-name \"$(PKGDIR)\" package-build--this-dir))) (package-build-archive '$(@F)))"
 
 	@echo " ✓ Wrote $$(ls -lsh $(PKGDIR)/$(@F)-*) "
 	@echo " Sleeping for $(SLEEP) ..."

diff --git a/cfg/home/service/reporter-stable/run b/cfg/home/service/reporter-stable/run
@@ -13,11 +13,11 @@ echo "Subject: [MELPA] `date "+%Y%m%d %H:%M %z"`" >> ${BODY}
 echo >> ${BODY}
 echo "# Old Packages" >> ${BODY}
 echo >> ${BODY}
-emacs --no-site-file --batch -l package-build.el --eval '(setq package-archive-dir (expand-file-name "packages-stable" pb/this-dir)))' scripts/expired >> ${BODY}
+emacs --no-site-file --batch -l package-build.el --eval '(setq package-archive-dir (expand-file-name "packages-stable" package-build--this-dir)))' scripts/expired >> ${BODY}
 echo >> ${BODY}
 echo "# Missing Packages" >> ${BODY}
 echo >> ${BODY}
-emacs --no-site-file --batch -l package-build.el --eval '(setq package-archive-dir (expand-file-name "packages-stable" pb/this-dir)))' sscripts/missing >> ${BODY}
+emacs --no-site-file --batch -l package-build.el --eval '(setq package-archive-dir (expand-file-name "packages-stable" package-build--this-dir)))' sscripts/missing >> ${BODY}
 
 /usr/sbin/sendmail -t < ${BODY}
 

diff --git a/features/step-definitions/melpa-steps.el b/features/step-definitions/melpa-steps.el
@@ -2,7 +2,7 @@
 
 (Given "^read recipes$"
        (lambda ()
-         (pb/read-recipes)))
+         (package-build--read-recipes)))
 
 (Given "^capture messages to \\(.+\\)$"
        (lambda (varby)

diff --git a/scripts/expired b/scripts/expired
@@ -30,6 +30,6 @@
 	    (time-subtract (current-time)
 			   (nth 5 (file-attributes entry-file))))
 	   (* 23 60 60))
-    (princ (symbol-name (car (pb/read-from-file entry-file))))
+    (princ (symbol-name (car (package-build--read-from-file entry-file))))
     (princ "\n")))
 
diff --git a/service/reporter-stable b/service/reporter-stable
@@ -13,11 +13,11 @@ echo "Subject: [MELPA] `date "+%Y%m%d %H:%M %z"`" >> ${BODY}
 echo >> ${BODY}
 echo "# Old Packages" >> ${BODY}
 echo >> ${BODY}
-emacs --no-site-file --batch -l package-build.el --eval '(setq package-archive-dir (expand-file-name "packages-stable" pb/this-dir)))' scripts/expired >> ${BODY}
+emacs --no-site-file --batch -l package-build.el --eval '(setq package-archive-dir (expand-file-name "packages-stable" package-build--this-dir)))' scripts/expired >> ${BODY}
 echo >> ${BODY}
 echo "# Missing Packages" >> ${BODY}
 echo >> ${BODY}
-emacs --no-site-file --batch -l package-build.el --eval '(setq package-archive-dir (expand-file-name "packages-stable" pb/this-dir)))' sscripts/missing >> ${BODY}
+emacs --no-site-file --batch -l package-build.el --eval '(setq package-archive-dir (expand-file-name "packages-stable" package-build--this-dir)))' sscripts/missing >> ${BODY}
 
 /usr/sbin/sendmail -t < ${BODY}