[ARVADOS] updated: 1.3.0-2969-gab5199f71

[Git user]

Summary of changes:
 cmd/arvados-dev/buildpackage.go | 1 +
 1 file changed, 1 insertion(+)

  discards  a3624b05754ebffd3627dd8ff892049a0a9ce63e (commit)
  discards  4e97dd930075f9383b4b7bf506d772a20ed6eac7 (commit)
       via  ab5199f71c7eaf8bf8fe2b4477353cf432faf1a7 (commit)
       via  f8d13408e99839f52260f889a5089126761eecb1 (commit)

This update added new revisions after undoing existing revisions.  That is
to say, the old revision is not a strict subset of the new revision.  This
situation occurs when you --force push a change and generate a repository
containing something like this:

 * -- * -- B -- O -- O -- O (a3624b05754ebffd3627dd8ff892049a0a9ce63e)
            \
             N -- N -- N (ab5199f71c7eaf8bf8fe2b4477353cf432faf1a7)

When this happens we assume that you've already had alert emails for all
of the O revisions, and so we here report only the revisions in the N
branch from the common base, B.

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.


commit ab5199f71c7eaf8bf8fe2b4477353cf432faf1a7
Author: Ward Vandewege <ward at curii.com>
Date:   Mon Nov 9 11:07:29 2020 -0500

    16306: really exclude /var/lib/arvados/go from the package, cf.
           https://github.com/jordansissel/fpm/issues/900
    
    Arvados-DCO-1.1-Signed-off-by: Ward Vandewege <ward at curii.com>

diff --git a/cmd/arvados-dev/buildpackage.go b/cmd/arvados-dev/buildpackage.go
index 125ac36b1..c562c5685 100644
--- a/cmd/arvados-dev/buildpackage.go
+++ b/cmd/arvados-dev/buildpackage.go
@@ -87,7 +87,7 @@ func (bldr *builder) run(ctx context.Context, prog string, args []string, stdin
 	cmd.Args = append(cmd.Args,
 		"--deb-use-file-permissions",
 		"--rpm-use-file-permissions",
-		"--exclude", "/var/lib/arvados/go",
+		"--exclude", "var/lib/arvados/go",
 		"/var/lib/arvados",
 		"/var/www/.gem",
 		"/var/www/.passenger",

commit f8d13408e99839f52260f889a5089126761eecb1
Author: Ward Vandewege <ward at curii.com>
Date:   Mon Nov 9 11:07:07 2020 -0500

    16306: shut up bundle warnings about /var/www
    
    Arvados-DCO-1.1-Signed-off-by: Ward Vandewege <ward at curii.com>

diff --git a/cmd/arvados-dev/buildpackage.go b/cmd/arvados-dev/buildpackage.go
index 00713550d..125ac36b1 100644
--- a/cmd/arvados-dev/buildpackage.go
+++ b/cmd/arvados-dev/buildpackage.go
@@ -91,6 +91,7 @@ func (bldr *builder) run(ctx context.Context, prog string, args []string, stdin
 		"/var/lib/arvados",
 		"/var/www/.gem",
 		"/var/www/.passenger",
+		"/var/www/.bundle",
 	)
 	fmt.Fprintf(stderr, "... %s\n", cmd.Args)
 	cmd.Dir = bldr.OutputDir
diff --git a/lib/install/deps.go b/lib/install/deps.go
index b39515cb1..3ff23d6e9 100644
--- a/lib/install/deps.go
+++ b/lib/install/deps.go
@@ -428,9 +428,9 @@ rm ${zip}
 				return 1
 			}
 			for _, cmdline := range [][]string{
-				{"mkdir", "-p", "log", "tmp", ".bundle", "/var/www/.gem", "/var/www/.passenger"},
+				{"mkdir", "-p", "log", "tmp", ".bundle", "/var/www/.gem", "/var/www/.bundle", "/var/www/.passenger"},
 				{"touch", "log/production.log"},
-				{"chown", "-R", "--from=root", "www-data:www-data", "/var/www/.gem", "/var/www/.passenger", "log", "tmp", ".bundle", "Gemfile.lock", "config.ru", "config/environment.rb"},
+				{"chown", "-R", "--from=root", "www-data:www-data", "/var/www/.gem", "/var/www/.bundle", "/var/www/.passenger", "log", "tmp", ".bundle", "Gemfile.lock", "config.ru", "config/environment.rb"},
 				{"sudo", "-u", "www-data", "/var/lib/arvados/bin/gem", "install", "--user", "--conservative", "--no-document", "bundler:1.16.6", "bundler:1.17.3", "bundler:2.0.2"},
 				{"sudo", "-u", "www-data", "/var/lib/arvados/bin/bundle", "install", "--deployment", "--jobs", "8", "--path", "/var/www/.gem"},
 				{"sudo", "-u", "www-data", "/var/lib/arvados/bin/bundle", "exec", "passenger-config", "build-native-support"},

-----------------------------------------------------------------------


hooks/post-receive
--