From 6580bf44b38ab35476b43fca16eb018b3df2c276 Mon Sep 17 00:00:00 2001
From: Holger Levsen <holger@layer-acht.org>
Date: Fri, 7 Aug 2015 17:07:59 +0200
Subject: reproducible: rename cleanup_userContent() to cleanup_pkg_files()

---
 bin/reproducible_blacklist.sh | 2 +-
 bin/reproducible_build.sh     | 2 +-
 bin/reproducible_common.sh    | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'bin')

diff --git a/bin/reproducible_blacklist.sh b/bin/reproducible_blacklist.sh
index 09bc7895..f541deee 100755
--- a/bin/reproducible_blacklist.sh
+++ b/bin/reproducible_blacklist.sh
@@ -18,7 +18,7 @@ blacklist_packages() {
 	for PKG in $PACKAGES ; do
 		VERSION=$(sqlite3 -init $INIT ${PACKAGES_DB} "SELECT version FROM sources WHERE name='$PKG' AND suite='$SUITE';")
 		PKGID=$(sqlite3 -init $INIT ${PACKAGES_DB} "SELECT id FROM sources WHERE name='$PKG' AND suite='$SUITE';")
-		cleanup_userContent
+		cleanup_pkg_files
 		sqlite3 -init $INIT ${PACKAGES_DB} "REPLACE INTO results (package_id, version, status, build_date) VALUES ('$PKGID', '$VERSION', 'blacklisted', '$DATE');"
 	done
 }
diff --git a/bin/reproducible_build.sh b/bin/reproducible_build.sh
index 6a6978c5..4cccab14 100755
--- a/bin/reproducible_build.sh
+++ b/bin/reproducible_build.sh
@@ -553,7 +553,7 @@ build_rebuild  # defines FTBFS redefines RBUILDLOG
 if [ $FTBFS -eq 0 ] ; then
 	check_buildinfo
 fi
-cleanup_userContent
+cleanup_pkg_files
 diff_copy_buildlogs
 update_rbuildlog
 if [ $FTBFS -eq 1 ] ; then
diff --git a/bin/reproducible_common.sh b/bin/reproducible_common.sh
index 5b6faf3d..107c55e4 100755
--- a/bin/reproducible_common.sh
+++ b/bin/reproducible_common.sh
@@ -439,7 +439,7 @@ get_filesize() {
 		fi
 }
 
-cleanup_userContent() {
+cleanup_pkg_files() {
 	rm -vf $BASE/rbuild/${SUITE}/${ARCH}/${SRCPACKAGE}_*.rbuild.log{,.gz}
 	rm -vf $BASE/logs/${SUITE}/${ARCH}/${SRCPACKAGE}_*.build?.log{,.gz}
 	rm -vf $BASE/dbd/${SUITE}/${ARCH}/${SRCPACKAGE}_*.debbindiff.html
-- 
cgit v1.2.3-54-g00ecf