Hello community, here is the log from the commit of package yast2-http-server for openSUSE:Factory checked in at 2014-07-31 07:41:51 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/yast2-http-server (Old) and /work/SRC/openSUSE:Factory/.yast2-http-server.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "yast2-http-server" Changes: -------- --- /work/SRC/openSUSE:Factory/yast2-http-server/yast2-http-server.changes 2013-10-20 10:54:36.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.yast2-http-server.new/yast2-http-server.changes 2014-07-31 07:42:04.000000000 +0200 @@ -1,0 +2,7 @@ +Wed Jul 30 15:03:11 UTC 2014 - cwh@suse.com + +- replaced given/when by regular if/elsif cascades to get rid of + perl's 'experimental' warnings (bnc#889595) +- 3.1.1 + +------------------------------------------------------------------- Old: ---- yast2-http-server-3.1.0.tar.bz2 New: ---- yast2-http-server-3.1.1.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-http-server.spec ++++++ --- /var/tmp/diff_new_pack.I8zanV/_old 2014-07-31 07:42:05.000000000 +0200 +++ /var/tmp/diff_new_pack.I8zanV/_new 2014-07-31 07:42:05.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package yast2-http-server # -# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,7 +17,7 @@ Name: yast2-http-server -Version: 3.1.0 +Version: 3.1.1 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -32,7 +32,7 @@ BuildRequires: sgml-skel BuildRequires: update-desktop-files BuildRequires: yast2 -BuildRequires: yast2-devtools >= 3.0.6 +BuildRequires: yast2-devtools >= 3.1.10 BuildRequires: yast2-network BuildRequires: yast2-packagemanager-devel BuildRequires: yast2-perl-bindings ++++++ yast2-http-server-3.1.0.tar.bz2 -> yast2-http-server-3.1.1.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-http-server-3.1.0/CONTRIBUTING.md new/yast2-http-server-3.1.1/CONTRIBUTING.md --- old/yast2-http-server-3.1.0/CONTRIBUTING.md 1970-01-01 01:00:00.000000000 +0100 +++ new/yast2-http-server-3.1.1/CONTRIBUTING.md 2014-07-30 17:49:43.000000000 +0200 @@ -0,0 +1,87 @@ +YaST Contribution Guidelines +============================ + +YaST is an open source project and as such it welcomes all kinds of +contributions. If you decide to contribute, please follow these guidelines to +ensure the process is effective and pleasant both for you and YaST maintainers. + +There are two main forms of contribution: reporting bugs and performing code +changes. + +Bug Reports +----------- + +If you find a problem, please report it either using +[Bugzilla](https://bugzilla.novell.com/enter_bug.cgi?format=guided&product=openSUSE+Factory&component=YaST2) +or [GitHub issues](../../issues). (For Bugzilla, use the [simplified +registration](https://secure-www.novell.com/selfreg/jsp/createSimpleAccount.jsp) +if you don't have an account yet.) + +If you find a problem, please report it either using +[Bugzilla](https://bugzilla.novell.com/) or GitHub issues. We can't guarantee +that every bug will be fixed, but we'll try. + +When creating a bug report, please follow our [bug reporting +guidelines](http://en.opensuse.org/openSUSE:Report_a_YaST_bug). + +Code Changes +------------ + +We welcome all kinds of code contributions, from simple bug fixes to significant +refactorings and implementation of new features. However, before making any +non-trivial contribution, get in touch with us first — this can prevent wasted +effort on both sides. Also, have a look at our [development +documentation](http://en.opensuse.org/openSUSE:YaST_development). + +To send us your code change, use GitHub pull requests. The workflow is as +follows: + + 1. Fork the project. + + 2. Create a topic branch based on `master`. + + 3. Implement your change, including tests (if possible). Make sure you adhere + to the [Ruby style + guide](https://github.com/SUSE/style-guides/blob/master/Ruby.md). + + 4. Make sure your change didn't break anything by building the RPM package + (`rake osc:build`). The build process includes running the full testsuite. + + 5. Publish the branch and create a pull request. + + 6. YaST developers will review your change and possibly point out issues. + Adapt the code under their guidance until they are all resolved. + + 7. Finally, the pull request will get merged or rejected. + +See also [GitHub's guide on +contributing](https://help.github.com/articles/fork-a-repo). + +If you want to do multiple unrelated changes, use separate branches and pull +requests. + +Do not change the `VERSION` and `*.changes` files as this could lead to +conflicts. + +### Commits + +Each commit in the pull request should do only one thing, which is clearly +described by its commit message. Especially avoid mixing formatting changes and +functional changes into one commit. When writing commit messages, adhere to +[widely used +conventions](http://tbaggery.com/2008/04/19/a-note-about-git-commit-messages.html). + +If your commit is related to a bug in Buzgilla or an issue on GitHub, make sure +you mention it in the commit message for cross-reference. Use format like +bnc#775814 or gh#yast/yast-foo#42. See also [GitHub +autolinking](https://help.github.com/articles/github-flavored-markdown#references) +and [openSUSE abbreviation +reference](http://en.opensuse.org/openSUSE:Packaging_Patches_guidelines#Current_set_of_...). + +Additional Information +---------------------- + +If you have any question, feel free to ask at the [development mailing +list](http://lists.opensuse.org/yast-devel/) or at the +[#yast](http://webchat.freenode.net/?channels=%23yast) IRC channel on freenode. +We'll do our best to provide a timely and accurate answer. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-http-server-3.1.0/VERSION new/yast2-http-server-3.1.1/VERSION --- old/yast2-http-server-3.1.0/VERSION 2013-10-16 12:29:50.000000000 +0200 +++ new/yast2-http-server-3.1.1/VERSION 1970-01-01 01:00:00.000000000 +0100 @@ -1 +0,0 @@ -3.1.0 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-http-server-3.1.0/package/yast2-http-server.changes new/yast2-http-server-3.1.1/package/yast2-http-server.changes --- old/yast2-http-server-3.1.0/package/yast2-http-server.changes 2013-10-16 12:29:50.000000000 +0200 +++ new/yast2-http-server-3.1.1/package/yast2-http-server.changes 2014-07-30 17:49:43.000000000 +0200 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Wed Jul 30 15:03:11 UTC 2014 - cwh@suse.com + +- replaced given/when by regular if/elsif cascades to get rid of + perl's 'experimental' warnings (bnc#889595) +- 3.1.1 + +------------------------------------------------------------------- Wed Sep 18 16:26:06 UTC 2013 - lslezak@suse.cz - do not use *.spec.in template, use *.spec file with RPM macros diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-http-server-3.1.0/package/yast2-http-server.spec new/yast2-http-server-3.1.1/package/yast2-http-server.spec --- old/yast2-http-server-3.1.0/package/yast2-http-server.spec 2013-10-16 12:29:50.000000000 +0200 +++ new/yast2-http-server-3.1.1/package/yast2-http-server.spec 2014-07-30 17:49:43.000000000 +0200 @@ -17,7 +17,7 @@ Name: yast2-http-server -Version: 3.1.0 +Version: 3.1.1 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -26,7 +26,7 @@ Group: System/YaST License: GPL-2.0 BuildRequires: yast2-network docbook-xsl-stylesheets doxygen libxslt perl-XML-Writer popt-devel sgml-skel update-desktop-files yast2 yast2-packagemanager-devel yast2-perl-bindings yast2-testsuite libzio -BuildRequires: yast2-devtools >= 3.0.6 +BuildRequires: yast2-devtools >= 3.1.10 Requires: yast2-network yast2-perl-bindings libzio # DnsServerApi moved to yast2.rpm (bnc#392606) # Wizard::SetDesktopTitleAndIcon diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-http-server-3.1.0/src/modules/YaPI/HTTPD.pm new/yast2-http-server-3.1.1/src/modules/YaPI/HTTPD.pm --- old/yast2-http-server-3.1.0/src/modules/YaPI/HTTPD.pm 2013-10-16 12:29:50.000000000 +0200 +++ new/yast2-http-server-3.1.1/src/modules/YaPI/HTTPD.pm 2014-07-30 17:49:43.000000000 +0200 @@ -296,7 +296,6 @@ =cut package YaPI::HTTPD; -use feature "switch"; use Data::Dumper; use YaPI; use YaST::YCP qw(:LOGGING sformat); @@ -355,25 +354,23 @@ } foreach my $key (sort keys (%{$vhost_files})) { - given($key) { - when ("ip-based") { - foreach my $hostList ($vhost_files->{'ip-based'}) { - foreach my $hostentryHash (@$hostList) { - push (@ret, $hostentryHash->{HOSTID}) if ($hostentryHash->{HOSTID}); - } - } - } - when ("main") { - push (@ret, $vhost_files->{'main'}{HOSTID}) if (defined ($vhost_files->{'main'}{HOSTID})); - } - default { - foreach my $hostList ( $vhost_files->{$key} ) { - foreach my $hostentryHash ( @$hostList ) { - push (@ret, $hostentryHash->{HOSTID}) if ($hostentryHash->{HOSTID}); - } - } - } - } + if($key eq "ip-based") { + foreach my $hostList ($vhost_files->{'ip-based'}) { + foreach my $hostentryHash (@$hostList) { + push (@ret, $hostentryHash->{HOSTID}) if ($hostentryHash->{HOSTID}); + } + } + } + elsif($key eq "main") { + push (@ret, $vhost_files->{'main'}{HOSTID}) if (defined ($vhost_files->{'main'}{HOSTID})); + } + else { + foreach my $hostList ( $vhost_files->{$key} ) { + foreach my $hostentryHash ( @$hostList ) { + push (@ret, $hostentryHash->{HOSTID}) if ($hostentryHash->{HOSTID}); + } + } + } } return \@ret; @@ -422,26 +419,24 @@ my $ret=undef; foreach my $key (sort keys (%{$vhost_files})) { - given ($key) { - when ("ip-based") { - foreach my $hostList ( $vhost_files->{'ip-based'} ) { - foreach my $hostentryHash (@$hostList) { - $ret = $hostentryHash if (($hostentryHash->{HOSTID}) && ($hostentryHash->{HOSTID} eq $hostid)); - } - } - } - when ("main") { - $ret = $vhost_files->{'main'} - if ((defined $vhost_files->{'main'}{HOSTID}) && ($vhost_files->{'main'}{HOSTID} eq $hostid)); - } - default { - foreach my $hostList ($vhost_files->{$key}) { - foreach my $hostentryHash (@$hostList) { - $ret = $hostentryHash if (($hostentryHash->{HOSTID}) && ($hostentryHash->{HOSTID} eq $hostid)); - } - } - } - } + if($key eq "ip-based") { + foreach my $hostList ( $vhost_files->{'ip-based'} ) { + foreach my $hostentryHash (@$hostList) { + $ret = $hostentryHash if (($hostentryHash->{HOSTID}) && ($hostentryHash->{HOSTID} eq $hostid)); + } + } + } + elsif($key eq "main") { + $ret = $vhost_files->{'main'} + if ((defined $vhost_files->{'main'}{HOSTID}) && ($vhost_files->{'main'}{HOSTID} eq $hostid)); + } + else { + foreach my $hostList ($vhost_files->{$key}) { + foreach my $hostentryHash (@$hostList) { + $ret = $hostentryHash if (($hostentryHash->{HOSTID}) && ($hostentryHash->{HOSTID} eq $hostid)); + } + } + } } return [@{$ret->{'DATA'}}] if (defined $ret); @@ -456,28 +451,26 @@ my %ret = (); foreach my $key (keys (%{$vhost_files})) { - given($key) { - when ("ip-based") { - foreach my $hostList ($vhost_files->{'ip-based'}) { - foreach my $hostentryHash (@$hostList) { - %ret = (type => 'ip-based', id => $hostentryHash->{HostIP}) - if (($hostentryHash->{HOSTID}) && ($hostentryHash->{HOSTID} eq $hostid)); - } - } - } - when ("main") { - %ret = (type => 'main') - if ((defined $vhost_files->{'main'}{HOSTID}) && ($vhost_files->{'main'}{HOSTID} eq $hostid)); - } - default { - foreach my $hostList ($vhost_files->{$key}) { - foreach my $hostentryHash (@$hostList) { - %ret = (type => 'name-based',id => $hostentryHash->{HostIP}) - if (($hostentryHash->{HOSTID}) && ($hostentryHash->{HOSTID} eq $hostid)); - } - } - } - } + if($key eq "ip-based") { + foreach my $hostList ($vhost_files->{'ip-based'}) { + foreach my $hostentryHash (@$hostList) { + %ret = (type => 'ip-based', id => $hostentryHash->{HostIP}) + if (($hostentryHash->{HOSTID}) && ($hostentryHash->{HOSTID} eq $hostid)); + } + } + } + elsif($key eq "main") { + %ret = (type => 'main') + if ((defined $vhost_files->{'main'}{HOSTID}) && ($vhost_files->{'main'}{HOSTID} eq $hostid)); + } + else { + foreach my $hostList ($vhost_files->{$key}) { + foreach my $hostentryHash (@$hostList) { + %ret = (type => 'name-based',id => $hostentryHash->{HostIP}) + if (($hostentryHash->{HOSTID}) && ($hostentryHash->{HOSTID} eq $hostid)); + } + } + } } return \%ret; @@ -530,24 +523,22 @@ my $hostid = shift; foreach my $key (keys (%{$vhost_files})) { - given($key) { - when ("ip-based") { - foreach my $hostList ($vhost_files->{'ip-based'}) { - my @tmp_list = (); - foreach my $hostentryHash (@$hostList) { + if($key eq "ip-based") { + foreach my $hostList ($vhost_files->{'ip-based'}) { + my @tmp_list = (); + foreach my $hostentryHash (@$hostList) { push(@tmp_list, $hostentryHash) if ($hostid ne $hostentryHash->{HOSTID}); - } - $vhost_files->{'ip-based'} = \@tmp_list; - } - } - when ("main") { - delete $vhost_files->{'main'} if ($hostid eq 'main'); - } - default { - my $vhost = $vhost_files->{$key}->[0]->{'HOSTID'}; - delete $vhost_files->{$key} if ($vhost eq $hostid); - } - } + } + $vhost_files->{'ip-based'} = \@tmp_list; + } + } + elsif($key eq "main") { + delete $vhost_files->{'main'} if ($hostid eq 'main'); + } + else { + my $vhost = $vhost_files->{$key}->[0]->{'HOSTID'}; + delete $vhost_files->{$key} if ($vhost eq $hostid); + } } } -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org