summaryrefslogtreecommitdiff
path: root/Master/tlpkg
diff options
context:
space:
mode:
authorNorbert Preining <preining@logic.at>2008-06-18 18:36:59 +0000
committerNorbert Preining <preining@logic.at>2008-06-18 18:36:59 +0000
commit35bf49efe29bec63bd2bd90993121c549a4abaa7 (patch)
tree682826b4ab8ff115c534779658eeaad920ef5176 /Master/tlpkg
parent01f670a6eb7cef526fcdc3be6c4f2808463afd74 (diff)
tlpsrc2tlpdb: fix for recomputation of bin package revisions
tl-update-container: add option --force to allow updates to smaller rev git-svn-id: svn://tug.org/texlive/trunk@8846 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/tlpkg')
-rwxr-xr-xMaster/tlpkg/bin/tl-update-containers12
-rwxr-xr-xMaster/tlpkg/bin/tlpsrc2tlpdb1
2 files changed, 11 insertions, 2 deletions
diff --git a/Master/tlpkg/bin/tl-update-containers b/Master/tlpkg/bin/tl-update-containers
index c5e71b6385f..770fa5fbb3a 100755
--- a/Master/tlpkg/bin/tl-update-containers
+++ b/Master/tlpkg/bin/tl-update-containers
@@ -27,6 +27,7 @@ our $mydir;
my $opt_location = ".";
my $opt_relative = 0;
my $opt_recreate = 0;
+my $opt_force = 0;
my $help = 0;
TeXLive::TLUtils::process_logging_options();
@@ -34,6 +35,7 @@ TeXLive::TLUtils::process_logging_options();
GetOptions(
"location=s" => \$opt_location,
"recreate" => \$opt_recreate,
+ "force" => \$opt_force,
"help|?" => \$help) or pod2usage(1);
pod2usage(-exitstatus => 0, -verbose => 2) if $help;
@@ -116,9 +118,15 @@ sub main
push @todopacks, $pkg;
$count{"updated"}++ if $oldrev;
} else {
- die "This shouldn't happen! The revision of $pkg in texlive.tlpdb"
+ my $warnstring = "This shouldn't happen! The revision of $pkg in texlive.tlpdb"
. "($newrev) is OLDER than the one in"
- . "$opt_location/tlpkg/texlive.tlpdb ($oldrev), goodbye";
+ . "$opt_location/tlpkg/texlive.tlpdb ($oldrev)";
+ if ($opt_force) {
+ push @todopacks, $pkg;
+ tlwarn($warnstring . "\nContinuing due to --force option!\n");
+ } else {
+ die ($warnstring . ", goodbye");
+ }
}
}
}
diff --git a/Master/tlpkg/bin/tlpsrc2tlpdb b/Master/tlpkg/bin/tlpsrc2tlpdb
index f872e8b2213..9d5c222251e 100755
--- a/Master/tlpkg/bin/tlpsrc2tlpdb
+++ b/Master/tlpkg/bin/tlpsrc2tlpdb
@@ -97,6 +97,7 @@ sub main
# since that might be much smaller, and we don't want to
# update every package only because one binary for one arch
# was changed
+ $binobj->revision(0);
$binobj->recompute_revision ($tltree, $tltree->file_svn_lastrevision("tlpkg/tlpsrc/$f"));
$tldb->add_tlpobj($binobj);
}