From 42be914da1abc613dfa27da313f69f4dea97e909 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Bernd=20Ble=C3=9Fmann?= Date: Wed, 13 Dec 2017 16:35:07 +0100 Subject: [PATCH] =?utf8?q?scripts/dbupgrade2=5Ftool.pl:=20kein=20Kontrollf?= =?utf8?q?eld=20f=C3=BCrs=20Encoding=20erzeugen?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Es wird nur utf8 unterstützt. Das Encoding-Kontrollfeld ist kein gültiges Feld mehr in den Upgrade-Dateien. Deshalb wird es nicht mehr erzeugt und das Encoding kann auch nicht mehr als Parameter mitgegeben werden. --- scripts/dbupgrade2_tool.pl | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/scripts/dbupgrade2_tool.pl b/scripts/dbupgrade2_tool.pl index 04c024e17..d5b5ebbd5 100755 --- a/scripts/dbupgrade2_tool.pl +++ b/scripts/dbupgrade2_tool.pl @@ -41,7 +41,7 @@ use SL::Dispatcher; my ($opt_list, $opt_tree, $opt_rtree, $opt_nodeps, $opt_graphviz, $opt_help); my ($opt_user, $opt_client, $opt_apply, $opt_applied, $opt_unapplied, $opt_format, $opt_test_utf8); my ($opt_dbhost, $opt_dbport, $opt_dbname, $opt_dbuser, $opt_dbpassword, $opt_create, $opt_type); -my ($opt_description, $opt_encoding, @opt_depends, $opt_auth_db); +my ($opt_description, @opt_depends, $opt_auth_db); our (%myconfig, $form, $user, $auth, $locale, $controls, $dbupgrader); @@ -117,9 +117,6 @@ dbupgrade2_tool.pl [options] Options for --create: --type \'sql\' or \'pl\'. Defaults to sql. --description The description field of the generated upgrade. - --encoding Encoding used for the file. Defaults to \'utf8\'. - Note: Your editor will not be told to open the file in - this encoding. --depends Tags of upgrades which this upgrade depends upon. Defaults to the latest stable release upgrade. Multiple values possible. @@ -267,9 +264,10 @@ sub create_upgrade { my $dbupgrader = $params{dbupgrader}; my $type = $params{type} || 'sql'; my $description = $params{description} || ''; - my $encoding = $params{encoding} || 'utf-8'; my @depends = @{ $params{depends} }; + my $encoding = 'utf-8'; + if (!@depends) { my @releases = grep { /^release_/ } keys %$controls; @depends = ((sort @releases)[-1]); @@ -295,7 +293,6 @@ sub create_upgrade { print $fh "$comment \@tag: $filename\n"; print $fh "$comment \@description: $description\n"; print $fh "$comment \@depends: @depends\n"; - print $fh "$comment \@encoding: $encoding\n"; if ($type eq 'pl') { print $fh "package SL::DBUpgrade2::$filename;\n"; @@ -498,7 +495,6 @@ GetOptions("list" => \$opt_list, "applied" => \$opt_applied, "create=s" => \$opt_create, "type=s" => \$opt_type, - "encoding=s" => \$opt_encoding, "description=s" => \$opt_description, "depends=s" => \@opt_depends, "unapplied" => \$opt_unapplied, @@ -527,7 +523,6 @@ create_upgrade(filename => $opt_create, dbupgrader => $dbupgrader, type => $opt_type, description => $opt_description, - encoding => $opt_encoding, depends => \@opt_depends) if ($opt_create); if ($opt_client && !connect_auth()->set_client($opt_client)) { -- 2.20.1