Hello community,

here is the log from the commit of package yast2-product-creator for 
openSUSE:Factory checked in at 2012-08-22 12:19:12
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/yast2-product-creator (Old)
 and      /work/SRC/openSUSE:Factory/.yast2-product-creator.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Package is "yast2-product-creator", Maintainer is "jsuch...@suse.com"

Changes:
--------
--- 
/work/SRC/openSUSE:Factory/yast2-product-creator/yast2-product-creator.changes  
    2012-06-29 07:04:29.000000000 +0200
+++ 
/work/SRC/openSUSE:Factory/.yast2-product-creator.new/yast2-product-creator.changes
 2012-08-22 12:19:14.000000000 +0200
@@ -1,0 +2,7 @@
+Thu Aug 16 15:53:29 CEST 2012 - jsuch...@suse.cz
+
+- added README.expert file, describing the option for forcing
+  the package version (bnc#767614)
+- 2.22.8 
+
+-------------------------------------------------------------------

Old:
----
  yast2-product-creator-2.22.7.tar.bz2

New:
----
  yast2-product-creator-2.22.8.tar.bz2

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

Other differences:
------------------
++++++ yast2-product-creator.spec ++++++
--- /var/tmp/diff_new_pack.BkkidH/_old  2012-08-22 12:19:15.000000000 +0200
+++ /var/tmp/diff_new_pack.BkkidH/_new  2012-08-22 12:19:15.000000000 +0200
@@ -17,7 +17,7 @@
 
 
 Name:           yast2-product-creator
-Version:        2.22.7
+Version:        2.22.8
 Release:        0
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
@@ -115,6 +115,8 @@
 %{_prefix}/share/applications/YaST2/image-creator.desktop
 %{_prefix}/lib/YaST2/bin/y2mkiso
 %doc %{_prefix}/share/doc/packages/yast2-product-creator
+%doc %{_prefix}/share/doc/packages/yast2-product-creator/README.expert
+
 %dir /usr/share/YaST2/data/product-creator
 /usr/share/YaST2/data/product-creator/*
 #%dir /etc/YaST2/product-creator

++++++ yast2-product-creator-2.22.7.tar.bz2 -> 
yast2-product-creator-2.22.8.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/yast2-product-creator-2.22.7/VERSION 
new/yast2-product-creator-2.22.8/VERSION
--- old/yast2-product-creator-2.22.7/VERSION    2012-06-28 14:40:49.000000000 
+0200
+++ new/yast2-product-creator-2.22.8/VERSION    2012-08-16 15:54:26.000000000 
+0200
@@ -1 +1 @@
-2.22.7
+2.22.8
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/yast2-product-creator-2.22.7/doc/Makefile.am 
new/yast2-product-creator-2.22.8/doc/Makefile.am
--- old/yast2-product-creator-2.22.7/doc/Makefile.am    2012-06-28 
14:39:56.000000000 +0200
+++ new/yast2-product-creator-2.22.8/doc/Makefile.am    2012-08-16 
15:35:52.000000000 +0200
@@ -6,7 +6,7 @@
 
 htmldir = $(docdir)
 
-doc_DATA =
+doc_DATA = README.expert
 html_DATA =
 
 EXTRA_DIST = $(doc_DATA) $(html_DATA)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/yast2-product-creator-2.22.7/doc/Makefile.in 
new/yast2-product-creator-2.22.8/doc/Makefile.in
--- old/yast2-product-creator-2.22.7/doc/Makefile.in    2012-06-28 
14:46:36.000000000 +0200
+++ new/yast2-product-creator-2.22.8/doc/Makefile.in    2012-08-16 
15:36:06.000000000 +0200
@@ -40,7 +40,7 @@
 host_triplet = @host@
 target_triplet = @target@
 subdir = doc
-DIST_COMMON = README $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/configure.in
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
@@ -232,7 +232,7 @@
 yncludedir = @yncludedir@
 ystartupdir = @ystartupdir@
 SUBDIRS = autodocs
-doc_DATA = 
+doc_DATA = README.expert
 html_DATA = 
 EXTRA_DIST = $(doc_DATA) $(html_DATA)
 all: all-recursive
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/yast2-product-creator-2.22.7/doc/README 
new/yast2-product-creator-2.22.8/doc/README
--- old/yast2-product-creator-2.22.7/doc/README 2012-06-28 14:39:56.000000000 
+0200
+++ new/yast2-product-creator-2.22.8/doc/README 1970-01-01 01:00:00.000000000 
+0100
@@ -1,16 +0,0 @@
-CD Creator
-++++++++++
-
-Enables the user to create an CD image suitable for installation from a 
-list of packages and files.
-
-       - plain list of packages and product data
-       - an AutoYaST control file
-       - Clone on CD using AutoYaST and the Backup modules
-
-
-Options:
-
-       - Create a bootable CD without packages suitable for installation
-         from a network source
-       - Create a source directory that can be used to create an ISO image
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/yast2-product-creator-2.22.7/doc/README.expert 
new/yast2-product-creator-2.22.8/doc/README.expert
--- old/yast2-product-creator-2.22.7/doc/README.expert  1970-01-01 
01:00:00.000000000 +0100
+++ new/yast2-product-creator-2.22.8/doc/README.expert  2012-08-16 
15:33:53.000000000 +0200
@@ -0,0 +1,61 @@
+CD Creator/Product Creator
+++++++++++++++++++++++++++
+
+Enables the user to create an CD image suitable for installation from a 
+list of packages and files.
+
+       - plain list of packages and product data
+       - an AutoYaST control file
+       - Clone on CD using AutoYaST and the Backup modules
+
+
+Options:
+
+       - Create a bootable CD without packages suitable for installation
+         from a network source
+       - Create a source directory that can be used to create an ISO image
+
+
+How to specify a version of package
+-----------------------------------
+
+In usual cases, you add only package names (via software selector UI) into the
+software set you need to create a product. YaST will always pick the latest
+available version for you. This is handy especially in the cases when you use
+update repository as one of your sources.
+
+However, in special cases there might be need to use specific package version.
+We do not offer specific UI option for that, you must edit the config file 
directly.
+
+The whole product configuration is stored in 
/var/lib/YaST2/cd-creator/cdcreator.xml
+file. The file has a section where all selected packages are listed:
+
+      <packages config:type="list">
+          <package>samba</package>
+          <package>samba-client</package>
+          <package>samba-winbind</package>
+      </packages>
+
+If you want to pick specific package versions, leave the 'packages' section as 
it is
+and add a new section to the config file, called 'package_versions'. It has 
following
+syntax:
+
+      <package_versions config:type="list">
+            <package>
+                <name>samba</name>
+                <version>1.2.3</version>
+            </package>
+            <package>
+                <name>samba-client</name>
+                <version>5.6</version>
+            </package>
+      </package_versions>
+
+In this example, packages 'samba' and 'samba-client' will stay with specified 
version.
+All other packages that are part of 'packages' and not part of 
'package_versions'
+(like 'samba-winbind' in this example) will be present in the latest version 
available.
+
+And as usual: do not touch the file unless you know what you are doing.
+
+For further discussion about this feature, see bug 767614 at:
+https://bugzilla.novell.com/show_bug.cgi?id=767614
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/yast2-product-creator-2.22.7/src/dialogs.ycp 
new/yast2-product-creator-2.22.8/src/dialogs.ycp
--- old/yast2-product-creator-2.22.7/src/dialogs.ycp    2012-06-28 
14:43:12.000000000 +0200
+++ new/yast2-product-creator-2.22.8/src/dialogs.ycp    2012-07-09 
10:11:35.000000000 +0200
@@ -117,7 +117,6 @@
      */
     boolean InstallPackageOrProviderVersion (string p, string version) {
 
-                    y2internal ("p %1, version '%2'", p, version);
                    boolean selected    = (version == "") ?
                       Pkg::PkgInstall(p) :
                       Pkg::ResolvableInstallArchVersion (p, `package, 
ProductCreator::GetArch(), version);
@@ -136,6 +135,7 @@
                        }
                    }
 
+                   return true;
     }
 
     boolean InstallPackageOrProvider (string p) {
@@ -1515,7 +1515,7 @@
            list<string> packages = ProductCreator::Config["packages"]:[];
            list<string> taboo = ProductCreator::Config["taboo"]:[];
 
-            map<string,string> versions = listmap (map p, 
ProductCreator::Config["package_versions"]:[], {
+           map<string,string> versions = listmap (map p, 
ProductCreator::Config["package_versions"]:[], {
                 return $[ p["name"]:"" : p["version"]:"" ];
             });
 

-- 
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org

Reply via email to