Selaa lähdekoodia

Fix bug # identification in get_bugs and install command for lxc

merge-requests/5/head
Jared Camins-Esakov 11 vuotta sitten
vanhempi
commit
99c0890991
  1. 3
      get_bugs.pl
  2. 2
      release-tool.pl

3
get_bugs.pl

@ -168,7 +168,7 @@ $arguments{lastrelease} = $4;
$arguments{downloadlink} = "http://download.koha-community.org/koha-$arguments{expandedversion}.tar.gz";
foreach (@git_log) {
if ($_ =~ m/([B|b]ug|BZ)?\s?(?<![a-z]|\.)(\d{4})[\s|:|,]/g) {
if ($_ =~ m/([B|b]ug|BZ)?\s?(?<![a-z]|\.)(\d{3,5})[\s|:|,]/g) {
# print "$&\n"; # Uncomment this line and the die below to view exact matches
push @bug_list, $2;
}
@ -325,6 +325,7 @@ foreach my $queryline (sort { lc($a) cmp lc($b) } @syspref_queries) {
$variable =~ s/['"`]//g;
push @sysprefs, { name => $variable };
}
@sysprefs = sort { lc($a->{'name'}) cmp lc($b->{'name'}) } @sysprefs;
$arguments{sysprefs} = \@sysprefs;
# Now we'll alphabetize the contributors based on surname (or at least the last word on their line)

2
release-tool.pl

@ -667,7 +667,7 @@ unless ( $config->param('skip-deb') || $config->param('skip-install') ) {
print_log("Installing from package for $flavour...");
my ($lxc_ip, $ssh) = create_lxc();
ssh_task( $ssh, "Downloading package...", "wget -nv http://10.0.3.1" . $config->param('package') . ' 2>&1', '', 1 );
ssh_task( $ssh, "Installing package...", "sudo dpkg --no-debsig -i " . basename($config->param('package')) . ' 2>&1; sudo apt-get -y -f --force-yes install 2>&1', '', 1 );
ssh_task( $ssh, "Installing package...", "sudo dpkg --no-debsig -i " . basename($config->param('package')) . ' 2>&1; sudo apt-get update; sudo apt-get -y -f --force-yes install 2>&1', '', 1 );
ssh_task( $ssh, "Running koha-create for $flavour",
"sudo koha-create --marcflavor=$lflavour --create-db pkgrel 2>&1", '',
1 );

Ladataan…
Peruuta
Tallenna