diff options
author | Karl Berry <karl@freefriends.org> | 2009-03-05 23:36:22 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2009-03-05 23:36:22 +0000 |
commit | 5d63d55a85a0c0693e814752f004760fdd679552 (patch) | |
tree | f027eb462fd06427141179892d1a748063e672b3 /Master/tlpkg | |
parent | ee245fb5cc4edbc3ee9b3a340651f3d2a654596d (diff) |
(make_container): make that "--exclude", ".svn",
not "--exclude=", ".svn", which includes every
.svn.
git-svn-id: svn://tug.org/texlive/trunk@12320 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/tlpkg')
-rw-r--r-- | Master/tlpkg/TeXLive/TLPOBJ.pm | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/Master/tlpkg/TeXLive/TLPOBJ.pm b/Master/tlpkg/TeXLive/TLPOBJ.pm index 6241baf42df..06233187de8 100644 --- a/Master/tlpkg/TeXLive/TLPOBJ.pm +++ b/Master/tlpkg/TeXLive/TLPOBJ.pm @@ -417,7 +417,8 @@ sub writeout_simple { } -sub make_container { +sub make_container +{ my ($self,$type,$instroot,$destdir,$containername,$relative) = @_; if (($type ne "lzma") && ($type ne "tar")) { die "$0: TLPOBJ supports tar and lzma containers, not $type"; @@ -504,14 +505,13 @@ sub make_container { # No owner/group options if we are being called on a user's machine to # make a backup. We only want these when we are making the master - # containers for tlnet. - # On TUG server where we create the containers we want to make sure that - # - UID and GID of the files are set to 0 - # - no subversion files are included + # containers for tlnet. Also exclude .svn directories when making the + # masters. We determine user vs. master by whether there's a revision + # suffix in the container name. my @attrs = $containername =~ /\.r[0-9]/ - ? () : ("--owner", "0", "--group", "0", "--exclude=", ".svn"); + ? () : ("--owner", "0", "--group", "0", "--exclude", ".svn"); my @cmdline = ($tar, "-cf", "$destdir/$tarname", @attrs); - + # Get list of files and symlinks to back up. Nothing else should be # in the list. my @files_to_backup = (); @@ -553,7 +553,7 @@ sub make_container { # if (length ("@files_to_backup") > 50000) { @files_to_backup = TeXLive::TLUtils::collapse_dirs(@files_to_backup); - # A complication, as always. collapse_dirs returns absolute paths. + # Yet another complication. collapse_dirs returns absolute paths. # We want to change them back to relative so that the backup tar # has the same structure. s,^$instroot/,, foreach @files_to_backup; |