diff options
| author | Mattia Rizzolo <mattia@debian.org> | 2016-08-31 14:36:19 +0000 |
|---|---|---|
| committer | Mattia Rizzolo <mattia@debian.org> | 2016-08-31 14:36:19 +0000 |
| commit | be93cd56319d64a77d9b64712c11c5799f4ff395 (patch) | |
| tree | 6da113a857dd98d8181f51e2a0066a7104cdc9dc | |
| parent | d9b8b432dd291c23ebaefd67d9e8988ad39e442c (diff) | |
| download | jenkins.debian.net-be93cd56319d64a77d9b64712c11c5799f4ff395.tar.xz | |
Revert "Vary the lengths of the two user names"
This reverts commit ca05c0d637910683f861aa3953a68419e6fa02aa.
| -rwxr-xr-x | bin/reproducible_build.sh | 4 | ||||
| -rwxr-xr-x | bin/reproducible_common.sh | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/bin/reproducible_build.sh b/bin/reproducible_build.sh index 3dde1feb..02b70b27 100755 --- a/bin/reproducible_build.sh +++ b/bin/reproducible_build.sh @@ -586,7 +586,7 @@ first_build() { local TMPCFG=$(mktemp -t pbuilderrc_XXXX --tmpdir=$TMPDIR) cat > "$TMPCFG" << EOF BUILDUSERID=1111 -export BUILDUSERNAME=pbuilderfirst +export BUILDUSERNAME=pbuilder1 export BUILDUSERGECOS="first user,first room,first work-phone,first home-phone,first other" # pbuilder sets HOME to the value of BUILD_HOME… BUILD_HOME=/nonexistent/first-build @@ -644,7 +644,7 @@ second_build() { esac cat > "$TMPCFG" << EOF BUILDUSERID=2222 -export BUILDUSERNAME=pbuildersecond +export BUILDUSERNAME=pbuilder2 export BUILDUSERGECOS="second user,second room,second work-phone,second home-phone,second other" # pbuilder sets HOME to the value of BUILD_HOME… BUILD_HOME=/nonexistent/second-build diff --git a/bin/reproducible_common.sh b/bin/reproducible_common.sh index 276cff6c..11f247a3 100755 --- a/bin/reproducible_common.sh +++ b/bin/reproducible_common.sh @@ -404,8 +404,8 @@ write_variation_table() { fi if [ "$1" = "debian" ] ; then write_page "<tr><td>env BUILDUSERID</td><td>BUILDUSERID=\"1111\"</td><td>BUILDUSERID=\"2222\"</td></tr>" - write_page "<tr><td>env BUILDUSERNAME</td><td>BUILDUSERNAME=\"pbuilderfirst\"</td><td>BUILDUSERNAME=\"pbuildersecond\"</td></tr>" - write_page "<tr><td>env USER</td><td>USER=\"pbuilderfirst\"</td><td>USER=\"pbuildersecond\"</td></tr>" + write_page "<tr><td>env BUILDUSERNAME</td><td>BUILDUSERNAME=\"pbuilder1\"</td><td>BUILDUSERNAME=\"pbuilder2\"</td></tr>" + write_page "<tr><td>env USER</td><td>USER=\"pbuilder1\"</td><td>USER=\"pbuilder2\"</td></tr>" write_page "<tr><td>env HOME</td><td>HOME=\"/nonexistent/first-build\"</td><td>HOME=\"/nonexistent/second-build\"</td></tr>" write_page "<tr><td>uid</td><td>uid=1111</td><td>uid=2222</td></tr>" write_page "<tr><td>gid</td><td>gid=1111</td><td>gid=2222</td></tr>" |