Hello community,

here is the log from the commit of package yast2-instserver for 
openSUSE:Factory checked in at 2017-08-10 14:04:17
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/yast2-instserver (Old)
 and      /work/SRC/openSUSE:Factory/.yast2-instserver.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Package is "yast2-instserver"

Thu Aug 10 14:04:17 2017 rev:48 rq:512817 version:3.3.0

Changes:
--------
--- /work/SRC/openSUSE:Factory/yast2-instserver/yast2-instserver.changes        
2016-06-07 23:46:56.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.yast2-instserver.new/yast2-instserver.changes   
2017-08-10 14:12:07.800226717 +0200
@@ -1,0 +2,8 @@
+Thu Jul 27 12:16:29 UTC 2017 - jreidin...@suse.com
+
+- move from yast2 agent for reading /content to support install of
+  old distros, as other parts of YaST2 already drop reading of 
+  /content (FATE#322386)
+- 3.3.0
+
+-------------------------------------------------------------------

Old:
----
  yast2-instserver-3.1.5.tar.bz2

New:
----
  yast2-instserver-3.3.0.tar.bz2

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ yast2-instserver.spec ++++++
--- /var/tmp/diff_new_pack.TbZsLP/_old  2017-08-10 14:12:08.632109589 +0200
+++ /var/tmp/diff_new_pack.TbZsLP/_new  2017-08-10 14:12:08.640108464 +0200
@@ -1,7 +1,7 @@
 #
 # spec file for package yast2-instserver
 #
-# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2017 SUSE LINUX 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-instserver
-Version:        3.1.5
+Version:        3.3.0
 Release:        0
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
@@ -30,14 +30,16 @@
 BuildRequires:  rubygem(rspec)
 BuildRequires:  rubygem(yast-rake)
 
-# ag_content agent
-# Wizard::SetDesktopTitleAndIcon
-Requires:       yast2 >= 2.21.22
+Requires:       yast2 > 3.3.4
+# file conflict, move of ag_content
+Conflicts:      yast2 <= 3.3.4
 
 BuildArch:      noarch
 
 Requires:       yast2-ruby-bindings >= 1.0.0
 
+Obsoletes:      yast2-instserver-devel-doc
+
 Summary:        YaST2 - Installation Server Configuration and Management
 License:        GPL-2.0+
 Group:          System/YaST
@@ -67,6 +69,8 @@
 %{yast_clientdir}/instserver.rb
 %{yast_moduledir}/Instserver.*
 %{yast_desktopdir}/instserver.desktop
+%{yast_scrconfdir}/*
+%{yast_agentdir}/ag_*
 /etc/YaST2/instserver
 /etc/apache2/conf.d/inst_server.conf.in
 %dir /etc/apache2

++++++ yast2-instserver-3.1.5.tar.bz2 -> yast2-instserver-3.3.0.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/yast2-instserver-3.1.5/.travis.yml 
new/yast2-instserver-3.3.0/.travis.yml
--- old/yast2-instserver-3.1.5/.travis.yml      2016-06-02 10:13:17.894908044 
+0200
+++ new/yast2-instserver-3.3.0/.travis.yml      2017-07-27 19:04:46.453798288 
+0200
@@ -1,13 +1,11 @@
-language: cpp
-compiler:
-    - gcc
+sudo: required
+language: bash
+services:
+  - docker
+
 before_install:
-    # disable rvm, use system Ruby
-    - rvm reset
-    - wget 
https://raw.githubusercontent.com/yast/yast-devtools/master/travis-tools/travis_setup.sh
-    - sh ./travis_setup.sh -p yast2 -g "rake yast-rake yard rspec:3.3.0"
+  - docker build -t yast-instserver-image .
 script:
-    - yardoc
-    - rake test:unit
-    - sudo rake install
-
+  # the "yast-travis-ruby" script is included in the base yastdevel/ruby image
+  # see https://github.com/yast/docker-yast-ruby/blob/master/yast-travis-ruby
+  - docker run -it -e TRAVIS=1 -e TRAVIS_JOB_ID="$TRAVIS_JOB_ID" 
yast-instserver-image yast-travis-ruby
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/yast2-instserver-3.1.5/CONTRIBUTING.md 
new/yast2-instserver-3.3.0/CONTRIBUTING.md
--- old/yast2-instserver-3.1.5/CONTRIBUTING.md  2016-06-02 10:13:17.910908044 
+0200
+++ new/yast2-instserver-3.3.0/CONTRIBUTING.md  2017-07-27 19:04:46.453798288 
+0200
@@ -3,7 +3,7 @@
 
 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.
+ensure the process is effective and pleasant both for you and the YaST 
maintainers.
 
 There are two main forms of contribution: reporting bugs and performing code
 changes.
@@ -17,13 +17,11 @@
 
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.suse.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).
 
+We can't guarantee that every bug will be fixed, but we'll try.
+
 Code Changes
 ------------
 
@@ -44,15 +42,22 @@
      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
+  4. Update the package version (in `packages/*.spec`, usually by
+     `rake version:bump`) and add a new entry to the `package/*.changes` file
+     (by `osc vc package`).  
+     For bigger changes or changes which need longer discussion it is advised 
to
+     add this as a separate last commit so it can be easily updated when 
another
+     change is merged in the meantime.
+
+  5. 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. Publish the branch and create a pull request.
 
-  6. YaST developers will review your change and possibly point out issues.
+  7. 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.
+  8. Finally, the pull request will get merged or rejected.
 
 See also [GitHub's guide on
 contributing](https://help.github.com/articles/fork-a-repo).
@@ -60,9 +65,6 @@
 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
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/yast2-instserver-3.1.5/Dockerfile 
new/yast2-instserver-3.3.0/Dockerfile
--- old/yast2-instserver-3.1.5/Dockerfile       1970-01-01 01:00:00.000000000 
+0100
+++ new/yast2-instserver-3.3.0/Dockerfile       2017-07-27 19:04:46.453798288 
+0200
@@ -0,0 +1,3 @@
+FROM yastdevel/ruby
+COPY . /usr/src/app
+
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' 
old/yast2-instserver-3.1.5/package/yast2-instserver.changes 
new/yast2-instserver-3.3.0/package/yast2-instserver.changes
--- old/yast2-instserver-3.1.5/package/yast2-instserver.changes 2016-06-02 
10:13:17.942908044 +0200
+++ new/yast2-instserver-3.3.0/package/yast2-instserver.changes 2017-07-27 
19:04:46.453798288 +0200
@@ -1,4 +1,12 @@
 -------------------------------------------------------------------
+Thu Jul 27 12:16:29 UTC 2017 - jreidin...@suse.com
+
+- move from yast2 agent for reading /content to support install of
+  old distros, as other parts of YaST2 already drop reading of 
+  /content (FATE#322386)
+- 3.3.0
+
+-------------------------------------------------------------------
 Wed Jun  1 13:58:26 UTC 2016 - igonzalezs...@suse.com
 
 - Drop yast2-instserver-devel-doc package (fate#320356)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/yast2-instserver-3.1.5/package/yast2-instserver.spec 
new/yast2-instserver-3.3.0/package/yast2-instserver.spec
--- old/yast2-instserver-3.1.5/package/yast2-instserver.spec    2016-06-02 
10:13:17.942908044 +0200
+++ new/yast2-instserver-3.3.0/package/yast2-instserver.spec    2017-07-27 
19:04:46.457798288 +0200
@@ -17,7 +17,7 @@
 
 
 Name:           yast2-instserver
-Version:        3.1.5
+Version:        3.3.0
 Release:        0
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
@@ -32,14 +32,16 @@
 BuildRequires:  rubygem(rspec)
 BuildRequires:  rubygem(yast-rake)
 
-# ag_content agent
-# Wizard::SetDesktopTitleAndIcon
-Requires:      yast2 >= 2.21.22
+Requires:      yast2 > 3.3.4
+# file conflict, move of ag_content
+Conflicts:      yast2 <= 3.3.4
 
 BuildArch:     noarch
 
 Requires:       yast2-ruby-bindings >= 1.0.0
 
+Obsoletes:      yast2-instserver-devel-doc
+
 Summary:       YaST2 - Installation Server Configuration and Management
 
 %description
@@ -68,6 +70,8 @@
 %{yast_clientdir}/instserver.rb
 %{yast_moduledir}/Instserver.*
 %{yast_desktopdir}/instserver.desktop
+%{yast_scrconfdir}/*
+%{yast_agentdir}/ag_*
 /etc/YaST2/instserver
 /etc/apache2/conf.d/inst_server.conf.in
 %dir /etc/apache2
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/yast2-instserver-3.1.5/src/scrconf/contentfile.scr 
new/yast2-instserver-3.3.0/src/scrconf/contentfile.scr
--- old/yast2-instserver-3.1.5/src/scrconf/contentfile.scr      1970-01-01 
01:00:00.000000000 +0100
+++ new/yast2-instserver-3.3.0/src/scrconf/contentfile.scr      2017-07-27 
19:04:46.469798288 +0200
@@ -0,0 +1,20 @@
+/**
+ * File:
+ *   contentfile.scr
+ * Summary:
+ *   SCR Agent for parsing content file
+ * Access:
+ *   read
+ * Authors:
+ *   Unknown <yast2-hac...@suse.de>
+ * See:
+ *   libscr
+ * Example:
+ *   map contentmap = (map)SCR::Read(.content_file, path_to_content_file);
+ *
+ * $Id$
+ *
+ */
+.content_file
+
+`ag_content ()
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/yast2-instserver-3.1.5/src/servers_non_y2/ag_content 
new/yast2-instserver-3.3.0/src/servers_non_y2/ag_content
--- old/yast2-instserver-3.1.5/src/servers_non_y2/ag_content    1970-01-01 
01:00:00.000000000 +0100
+++ new/yast2-instserver-3.3.0/src/servers_non_y2/ag_content    2017-07-27 
19:04:46.469798288 +0200
@@ -0,0 +1,55 @@
+#!/usr/bin/perl
+
+use strict;
+
+package ag_content;
+use ycp;
+use YaST::SCRAgent;
+use diagnostics;
+
+use Getopt::Long;
+use POSIX qw(tmpnam);
+use IO::File;
+
+our @ISA = ("YaST::SCRAgent");
+
+y2milestone ("ag_content started");
+
+# read the agent arguments
+#$_ = <STDIN>;
+# no input at all - simply exit
+#exit if ! defined $_;
+
+
+sub Read ()
+{
+    my $class = shift;
+    my ($path, $content_file) = @_;
+
+    my %content;
+    my $fh;
+    if (defined($content_file)) {
+        $fh = IO::File->new("< $content_file")
+            or return %content;
+
+        while(<$fh>)
+        {
+            m/^(\S*)\s(.*)/;
+            $content{$1} = $2;
+        }
+        close $fh;
+    }
+
+    return( \%content );
+}
+
+
+
+
+package main;
+
+ag_content->Run ();
+
+
+
+#EOF


Reply via email to