Hello community, here is the log from the commit of package linuxrc for openSUSE:Factory checked in at 2015-02-06 10:57:19 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/linuxrc (Old) and /work/SRC/openSUSE:Factory/.linuxrc.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "linuxrc" Changes: -------- --- /work/SRC/openSUSE:Factory/linuxrc/linuxrc.changes 2015-01-21 21:50:44.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.linuxrc.new/linuxrc.changes 2015-02-06 10:57:21.000000000 +0100 @@ -1,0 +2,7 @@ +Thu Feb 5 12:01:12 CET 2015 - [email protected] + +- update git2log script +- keep default nanny setting unless explicitly changed +- 5.0.31 + +------------------------------------------------------------------- Old: ---- linuxrc-5.0.30.tar.xz New: ---- linuxrc-5.0.31.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ linuxrc.spec ++++++ --- /var/tmp/diff_new_pack.m1POWY/_old 2015-02-06 10:57:22.000000000 +0100 +++ /var/tmp/diff_new_pack.m1POWY/_new 2015-02-06 10:57:22.000000000 +0100 @@ -25,7 +25,7 @@ Summary: SUSE Installation Program License: GPL-3.0+ Group: System/Boot -Version: 5.0.30 +Version: 5.0.31 Release: 0 Source: %{name}-%{version}.tar.xz BuildRoot: %{_tmppath}/%{name}-%{version}-build ++++++ linuxrc-5.0.30.tar.xz -> linuxrc-5.0.31.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/linuxrc-5.0.30/VERSION new/linuxrc-5.0.31/VERSION --- old/linuxrc-5.0.30/VERSION 2015-01-14 12:15:37.000000000 +0100 +++ new/linuxrc-5.0.31/VERSION 2015-02-05 11:58:44.000000000 +0100 @@ -1 +1 @@ -5.0.30 +5.0.31 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/linuxrc-5.0.30/changelog new/linuxrc-5.0.31/changelog --- old/linuxrc-5.0.30/changelog 2015-01-14 12:15:37.000000000 +0100 +++ new/linuxrc-5.0.31/changelog 2015-02-05 11:58:44.000000000 +0100 @@ -1,8 +1,12 @@ -2015-01-07: 2623322f6d1cd888d449930a556d8b29ddea846a-5.0.30 +2015-02-05: 5.0.31 + - update git2log script + - keep default nanny setting unless explicitly changed + +2015-01-07: 5.0.30 - activate newly added interfaces (bnc #906817) - improve git2log to work in sub-branches - gpg 2.1.1 became stricter with the usage of --verify: - program knows about it; either give both filenames on the command + - program knows about it; either give both filenames on the command line or use '-' to specify STDIN.". 2014-12-01: 5.0.29 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/linuxrc-5.0.30/file.c new/linuxrc-5.0.31/file.c --- old/linuxrc-5.0.30/file.c 2015-01-14 12:15:37.000000000 +0100 +++ new/linuxrc-5.0.31/file.c 2015-02-05 11:58:44.000000000 +0100 @@ -1679,7 +1679,13 @@ break; case key_nanny: - if(f->is.numeric) config.nanny = f->nvalue; + if(f->is.numeric) { + config.nanny = f->nvalue; + config.nanny_set = 1; + } + else { + config.nanny_set = 0; + } break; case key_vlanid: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/linuxrc-5.0.30/git2log new/linuxrc-5.0.31/git2log --- old/linuxrc-5.0.30/git2log 2015-01-14 12:15:37.000000000 +0100 +++ new/linuxrc-5.0.31/git2log 2015-02-05 11:58:44.000000000 +0100 @@ -64,10 +64,16 @@ @tags = get_branch_tags; die "no tags at all?\n" unless @tags; -if(!grep { /^$branch\-/ } @tags) { - $branch = get_parent_branch; - die "sorry, can't determine branch\n" unless $branch; +if($branch ne 'master') { + if(!grep { /^$branch\-/ } @tags) { + $branch = get_parent_branch; + die "sorry, can't determine branch\n" unless $branch; + @tags = get_branch_tags; + die "no tags at all?\n" unless @tags; + } +} +else { @tags = get_branch_tags; die "no tags at all?\n" unless @tags; } @@ -147,12 +153,10 @@ my $detail = 0; for (@t) { $detail = 1 if /^ $/; + $detail = 2 if /^ Conflicts:$/; $detail = 0 if /^commit /; - if($detail && /^ [^\-\s]/) { - # push @t2, "# $_"; - } - else { - push @t2, $_; + if(!$detail || !/^ [^\-\s]/) { + push @t2, $_ if $detail < 2; } } @t = @t2; @@ -170,7 +174,7 @@ # handle white space in every first line once and for all my $empty = 1; for (@t) { - $empty = 1, next if $_ eq ""; + $empty = 1, $_ = "", next if $_ =~ /^\s*$/; next if !$empty; s/^\s*//; $empty = 0; @@ -273,7 +277,7 @@ # print "parent = $p\n"; - return $p; + return $p || "master"; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/linuxrc-5.0.30/global.h new/linuxrc-5.0.31/global.h --- old/linuxrc-5.0.30/global.h 2015-01-14 12:15:37.000000000 +0100 +++ new/linuxrc-5.0.31/global.h 2015-02-05 11:58:44.000000000 +0100 @@ -398,6 +398,7 @@ unsigned restarted:1; /* we have been restarted */ unsigned wicked:1; /* use wicked for network setup */ unsigned nanny:1; /* use wickedd-nanny */ + unsigned nanny_set:1; /* nanny setting was changed */ unsigned upgrade:1; /* upgrade or fresh install */ struct { unsigned check:1; /* check for braille displays and start brld if found */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/linuxrc-5.0.30/linuxrc.c new/linuxrc-5.0.31/linuxrc.c --- old/linuxrc-5.0.30/linuxrc.c 2015-01-14 12:15:37.000000000 +0100 +++ new/linuxrc-5.0.31/linuxrc.c 2015-02-05 11:58:44.000000000 +0100 @@ -806,7 +806,7 @@ config.ifcfg.manual = calloc(1, sizeof *config.ifcfg.manual); config.ifcfg.manual->dhcp = 1; - config.nanny = 0; // disable for now + // config.nanny = 0; /* see config.nanny_set */ #if defined(__s390__) || defined(__s390x__) config.linemode = 1; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/linuxrc-5.0.30/net.c new/linuxrc-5.0.31/net.c --- old/linuxrc-5.0.30/net.c 2015-01-14 12:15:37.000000000 +0100 +++ new/linuxrc-5.0.31/net.c 2015-02-05 11:58:44.000000000 +0100 @@ -2887,6 +2887,9 @@ { FILE *fp, *fp2; + // keep the default unless explicitly changed + if(!config.nanny_set) return; + if((fp = fopen("/etc/wicked/common.xml", "r"))) { char buf[4096]; -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
