diff options
| author | Holger Levsen <holger@layer-acht.org> | 2015-08-07 17:07:59 +0200 |
|---|---|---|
| committer | Holger Levsen <holger@layer-acht.org> | 2015-08-07 17:07:59 +0200 |
| commit | 6580bf44b38ab35476b43fca16eb018b3df2c276 (patch) | |
| tree | 74cc068573cc14a9d04d0a19b69fe71f83ce0a90 | |
| parent | 74a9949bb6b7944106b2a97257a726bb34c90369 (diff) | |
| download | jenkins.debian.net-6580bf44b38ab35476b43fca16eb018b3df2c276.tar.xz | |
reproducible: rename cleanup_userContent() to cleanup_pkg_files()
| -rwxr-xr-x | bin/reproducible_blacklist.sh | 2 | ||||
| -rwxr-xr-x | bin/reproducible_build.sh | 2 | ||||
| -rwxr-xr-x | bin/reproducible_common.sh | 2 |
3 files changed, 3 insertions, 3 deletions
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 |