Hello community,
here is the log from the commit of package yast2-add-on-creator for openSUSE:Factory
checked in at Thu Dec 18 15:22:59 CET 2008.
--------
--- yast2-add-on-creator/yast2-add-on-creator.changes 2008-12-03 15:12:05.000000000 +0100
+++ /mounts/work_src_done/STABLE/yast2-add-on-creator/yast2-add-on-creator.changes 2008-12-17 21:22:56.210850000 +0100
@@ -1,0 +2,17 @@
+Wed Dec 17 14:34:32 CET 2008 - jsuchome@suse.cz
+
+- added CLI support for product file (disable generating, offer
+ path to import)
+- removed debug popup
+- enable importing product file with dependency data
+- 2.17.10
+
+-------------------------------------------------------------------
+Fri Dec 12 16:02:16 CET 2008 - jsuchome@suse.cz
+
+- call bs_productconvert from correct path
+- import data from -release packages when cloning product
+ (fate#305172)
+- 2.17.9
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
Old:
----
yast2-add-on-creator-2.17.8.tar.bz2
New:
----
yast2-add-on-creator-2.17.10.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-add-on-creator.spec ++++++
--- /var/tmp/diff_new_pack.B21929/_old 2008-12-18 15:22:16.000000000 +0100
+++ /var/tmp/diff_new_pack.B21929/_new 2008-12-18 15:22:16.000000000 +0100
@@ -1,5 +1,5 @@
#
-# spec file for package yast2-add-on-creator (Version 2.17.8)
+# spec file for package yast2-add-on-creator (Version 2.17.10)
#
# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
@@ -19,12 +19,12 @@
Name: yast2-add-on-creator
-Version: 2.17.8
+Version: 2.17.10
Release: 1
License: GPL v2 only; GPL v2 or later
Group: System/YaST
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: yast2-add-on-creator-2.17.8.tar.bz2
+Source0: yast2-add-on-creator-2.17.10.tar.bz2
Prefix: /usr
PreReq: %fillup_prereq
Requires: yast2
@@ -42,7 +42,7 @@
Jiri Suchomel
%prep
-%setup -n yast2-add-on-creator-2.17.8
+%setup -n yast2-add-on-creator-2.17.10
%build
%{prefix}/bin/y2tool y2autoconf
@@ -84,6 +84,17 @@
%doc %{prefix}/share/doc/packages/yast2-add-on-creator
/var/adm/fillup-templates/sysconfig.add-on-creator
%changelog
+* Wed Dec 17 2008 jsuchome@suse.cz
+- added CLI support for product file (disable generating, offer
+ path to import)
+- removed debug popup
+- enable importing product file with dependency data
+- 2.17.10
+* Fri Dec 12 2008 jsuchome@suse.cz
+- call bs_productconvert from correct path
+- import data from -release packages when cloning product
+ (fate#305172)
+- 2.17.9
* Wed Dec 03 2008 jsuchome@suse.cz
- flag is GE, not GT
- read product requires from existing release packages
++++++ yast2-add-on-creator-2.17.8.tar.bz2 -> yast2-add-on-creator-2.17.10.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-add-on-creator-2.17.8/configure new/yast2-add-on-creator-2.17.10/configure
--- old/yast2-add-on-creator-2.17.8/configure 2008-10-22 16:04:13.000000000 +0200
+++ new/yast2-add-on-creator-2.17.10/configure 2008-12-17 13:32:23.000000000 +0100
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.61 for yast2-add-on-creator 2.17.5.
+# Generated by GNU Autoconf 2.61 for yast2-add-on-creator 2.17.9.
#
# Report bugs to http://bugs.opensuse.org/.
#
@@ -574,8 +574,8 @@
# Identity of this package.
PACKAGE_NAME='yast2-add-on-creator'
PACKAGE_TARNAME='yast2-add-on-creator'
-PACKAGE_VERSION='2.17.5'
-PACKAGE_STRING='yast2-add-on-creator 2.17.5'
+PACKAGE_VERSION='2.17.9'
+PACKAGE_STRING='yast2-add-on-creator 2.17.9'
PACKAGE_BUGREPORT='http://bugs.opensuse.org/'
ac_unique_file="RPMNAME"
@@ -1197,7 +1197,7 @@
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures yast2-add-on-creator 2.17.5 to adapt to many kinds of systems.
+\`configure' configures yast2-add-on-creator 2.17.9 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1268,7 +1268,7 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of yast2-add-on-creator 2.17.5:";;
+ short | recursive ) echo "Configuration of yast2-add-on-creator 2.17.9:";;
esac
cat <<\_ACEOF
@@ -1346,7 +1346,7 @@
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-yast2-add-on-creator configure 2.17.5
+yast2-add-on-creator configure 2.17.9
generated by GNU Autoconf 2.61
Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -1360,7 +1360,7 @@
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by yast2-add-on-creator $as_me 2.17.5, which was
+It was created by yast2-add-on-creator $as_me 2.17.9, which was
generated by GNU Autoconf 2.61. Invocation command line was
$ $0 $@
@@ -2181,7 +2181,7 @@
# Define the identity of the package.
PACKAGE='yast2-add-on-creator'
- VERSION='2.17.5'
+ VERSION='2.17.9'
cat >>confdefs.h <<_ACEOF
@@ -2409,7 +2409,7 @@
-VERSION="2.17.5"
+VERSION="2.17.9"
RPMNAME="yast2-add-on-creator"
MAINTAINER="Jiri Suchomel "
@@ -3304,7 +3304,7 @@
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by yast2-add-on-creator $as_me 2.17.5, which was
+This file was extended by yast2-add-on-creator $as_me 2.17.9, which was
generated by GNU Autoconf 2.61. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -3347,7 +3347,7 @@
_ACEOF
cat >>$CONFIG_STATUS <<_ACEOF
ac_cs_version="\\
-yast2-add-on-creator config.status 2.17.5
+yast2-add-on-creator config.status 2.17.9
configured by $0, generated by GNU Autoconf 2.61,
with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-add-on-creator-2.17.8/configure.in new/yast2-add-on-creator-2.17.10/configure.in
--- old/yast2-add-on-creator-2.17.8/configure.in 2008-10-22 16:04:07.000000000 +0200
+++ new/yast2-add-on-creator-2.17.10/configure.in 2008-12-17 13:32:17.000000000 +0100
@@ -3,7 +3,7 @@
dnl -- This file is generated by y2autoconf 2.16.8 - DO NOT EDIT! --
dnl (edit configure.in.in instead)
-AC_INIT(yast2-add-on-creator, 2.17.5, http://bugs.opensuse.org/, yast2-add-on-creator)
+AC_INIT(yast2-add-on-creator, 2.17.9, http://bugs.opensuse.org/, yast2-add-on-creator)
dnl Check for presence of file 'RPMNAME'
AC_CONFIG_SRCDIR([RPMNAME])
@@ -18,7 +18,7 @@
AM_INIT_AUTOMAKE(tar-ustar -Wno-portability)
dnl Important YaST2 variables
-VERSION="2.17.5"
+VERSION="2.17.9"
RPMNAME="yast2-add-on-creator"
MAINTAINER="Jiri Suchomel "
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-add-on-creator-2.17.8/src/add-on-creator.ycp new/yast2-add-on-creator-2.17.10/src/add-on-creator.ycp
--- old/yast2-add-on-creator-2.17.8/src/add-on-creator.ycp 2008-10-13 16:36:17.000000000 +0200
+++ new/yast2-add-on-creator-2.17.10/src/add-on-creator.ycp 2008-12-17 14:16:52.000000000 +0100
@@ -146,6 +146,22 @@
return false;
}
}
+ if (haskey (options, "product_file"))
+ {
+ string file = options["product_file"]:"";
+ if (FileUtils::Exists (file))
+ {
+ AddOnCreator::product_xml =
+ AddOnCreator::ReadProductXML (file);
+ AddOnCreator::product_info =
+ AddOnCreator::GetProductInfo (AddOnCreator::product_xml, false);
+ }
+ else
+ {
+ ReportMissingFile (file);
+ return false;
+ }
+ }
if (haskey (options, "package_descriptions_dir"))
{
string dir = options["package_descriptions_dir"]:"";
@@ -320,6 +336,11 @@
}
current_product["changelog"] = haskey (options, "changelog");
+ current_product["generate_release_package"] = true;
+ if (haskey (options, "no_release_package"))
+ {
+ current_product["generate_release_package"] = false;
+ }
if (!haskey (options, "do_not_sign"))
{
current_product = union (current_product, ParseGPGData (options));
@@ -495,7 +516,12 @@
if (haskey (options, "changelog"))
product["changelog"] = true;
+ // CLI option could replace the saved one
+ if (haskey (options, "no_release_package"))
+ product["generate_release_package"] = false;
+
AddOnCreator::SelectProduct (product);
+
AddOnCreator::PrepareBuild ();
AddOnCreator::BuildAddOn ();
return false;
@@ -686,6 +712,15 @@
// command line help text for 'changelog' option
"help" : _("Generate a Changelog file."),
],
+ "no_release_package" : $[
+ // command line help text for 'no_release_package' option
+ "help" : _("Do not generate the release package"),
+ ],
+ "product_file" : $[
+ // command line help text for 'product_file' option
+ "help" : _("Path to file with the product description (*.prod)"),
+ "type" : "string",
+ ],
],
"mappings" : $[
"create" : [ "content", "rpm_dir", "package_descriptions_dir",
@@ -693,7 +728,7 @@
"passphrase", "passphrase_file", "workflow", "y2update",
"y2update_packages_dir", "license", "do_not_sign", "iso_output_dir",
"resign_packages", "info", "extra_prov", "do_not_build",
- "changelog",
+ "changelog", "no_release_package", "product_file",
],
"clone" : [ "existing", "generate_descriptions", "content",
"package_descriptions_dir", "patterns_dir", "output_dir",
@@ -701,7 +736,7 @@
"gpg_key", "passphrase", "passphrase_file", "workflow", "y2update",
"y2update_packages_dir", "license", "do_not_sign", "iso_output_dir",
"resign_packages", "info", "extra_prov", "do_not_build",
- "changelog",
+ "changelog", "no_release_package", "product_file",
],
"sign" : [ "addon_dir", "gpg_key", "passphrase",
"passphrase_file", "create_iso", "iso_name", "iso_output_dir",
@@ -710,7 +745,7 @@
"build" : [
"number", "gpg_key", "passphrase", "passphrase_file",
"resign_packages", "create_iso", "iso_name", "iso_output_dir",
- "changelog",
+ "changelog", "no_release_package",
],
"delete" : [
"number"
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-add-on-creator-2.17.8/src/AddOnCreator.ycp new/yast2-add-on-creator-2.17.10/src/AddOnCreator.ycp
--- old/yast2-add-on-creator-2.17.8/src/AddOnCreator.ycp 2008-12-03 15:08:50.000000000 +0100
+++ new/yast2-add-on-creator-2.17.10/src/AddOnCreator.ycp 2008-12-17 14:34:20.000000000 +0100
@@ -24,7 +24,7 @@
* Summary: AddOnCreator settings, input and output functions
* Authors: Jiri Suchomel
*
- * $Id: AddOnCreator.ycp 53823 2008-12-02 15:01:38Z jsuchome $
+ * $Id: AddOnCreator.ycp 54098 2008-12-12 15:06:30Z jsuchome $
*
* Representation of the configuration of add-on-creator.
* Input and output routines.
@@ -116,6 +116,8 @@
"resign_packages" : false,
// current GPG key
"gpg_key" : "",
+ // if we should generate -release package containing .prod file
+ "generate_release_package" : true,
];
// skeleton for current_product map (with keys and default values)
@@ -745,9 +747,6 @@
// if package description files should be compressed
global boolean compress_package_descriptions = false;
-// if we should generate -release package containing .prod file
-global boolean generate_release_package = true;
-
/**
* Data was modified?
*/
@@ -850,7 +849,7 @@
else
// manual modifications present -> generate
// this is used when product xml was read from rpm
- generate_release_package = true;
+ current_product["generate_release_package"] = true;
}
else
retmap[key,"value"] = val;
@@ -1582,6 +1581,25 @@
}
Progress::NextStage();
}
+ // we want to find and read release packages for cloned product
+ else {
+ out = (map) SCR::Execute (.target.bash_output,
+ sformat ("find %1 -name '*-release*'", rpm_path));
+ foreach (string f, splitstring (out["stdout"]:"", "\n"), {
+ if (f == "") return;
+ out = (map) SCR::Execute (.target.bash_output,
+ sformat ("rpm -q -p %1 --qf \"%%{NAME}\n%%|SOURCERPM?{bin}:{src}|\"",f));
+ list lines = splitstring (out["stdout"]:"", "\n");
+ string name = lines[0]:"";
+ string sourcerpm = lines[1]:"";
+ if (sourcerpm != "src" && name != "" &&
+ size (name) > 8 && issubstring (name, "-release"))
+ {
+ y2milestone ("release package found: %1, %2", name, f);
+ release_packages = add (release_packages, f);
+ }
+ });
+ }
if (rpm_path == "")
{
Progress::Finish ();
@@ -1590,14 +1608,16 @@
string reldir = tmpdir + "/release";
if (release_packages != [])
{
- SCR::Execute (.target.mkdir, reldir);
// when release package is present, do not offer to change it
- generate_release_package = false;
+ current_product["generate_release_package"] = false;
}
list requireslist = [];
// read the product info contained in release package
foreach (string release_package, release_packages, {
+ // use 'reldir' only for one package
+ SCR::Execute (.target.bash, "rm -rf " + reldir);
+ SCR::Execute (.target.mkdir, reldir);
SCR::Execute (.target.bash,
sformat ("cp %1 %2", release_package, reldir));
SCR::Execute (.target.bash,
@@ -1640,7 +1660,7 @@
requiremap["flavor"] = tokens[2]:"";
if (tokens[5]:"" != "")
requiremap["release"] = tokens[5]:"";
- y2debug ("requiremap: %1", requiremap);
+ y2milestone ("requiremap: %1", requiremap);
requireslist = add (requireslist, requiremap);
});
return;
@@ -2186,7 +2206,7 @@
*/
global boolean GenerateReleasePackage (string base_path) {
- if (!generate_release_package)
+ if (!current_product["generate_release_package"]:false)
{
y2milestone ("release package should not be generated");
return true;
@@ -2206,7 +2226,12 @@
// write the result into temporary .prod file
string name = content_map["NAME"]:"add-on";
- map submap = product_xml["product",0]:$[];
+ map submap = product_xml;
+ if (size (product_xml["productdefinition",0,"products"]:[]) > 0)
+ {
+ submap = product_xml["productdefinition",0,"products",0]:$[];
+ }
+ submap = submap["product",0]:$[];
submap["id"] = name;
submap["name",0, content_key] = name;
@@ -2293,7 +2318,8 @@
// 2. call bs_productconvert to generate a spec file for -release package
map out = (map) SCR::Execute (.target.bash_output, sformat (
- "bs_productconvert %1 %2 %3", prod_file_path, product_dir, name));
+ "/usr/lib/obs/server/bs_productconvert %1 %2 %3",
+ prod_file_path, product_dir, name));
// 3. build the release package from generated .spec file
string cmd = sformat (
@@ -2340,8 +2366,6 @@
SCR::Execute (.target.bash, sformat ("/bin/cp -r %1 '%2/%3'",
package_path, full_data_path, arch));
});
-import "Popup";
-Popup::Message ("built");
// 5. delete the tmp files, so it doesn't mess possible next builds
SCR::Execute (.target.remove, prod_file_path);
SCR::Execute (.target.bash, sformat ("rm -rf '%1'", product_dir));
@@ -2829,7 +2853,6 @@
map modified_product = union (current_product, $[
"content_map" : content_map,
"product_info_values" : product_info_values,
- "generate_release_package" : generate_release_package,
"available_packages" : available_packages,
"arch_directories" : arch_directories,
"package2filename" : package2filename,
@@ -2866,8 +2889,6 @@
product_info[key] = desc;
});
- generate_release_package = product["generate_release_package"]:false;
-
// generate content from content_map
content = [];
foreach (string key, map entry, content_descr, {
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-add-on-creator-2.17.8/src/complex.ycp new/yast2-add-on-creator-2.17.10/src/complex.ycp
--- old/yast2-add-on-creator-2.17.8/src/complex.ycp 2008-12-03 12:44:24.000000000 +0100
+++ new/yast2-add-on-creator-2.17.10/src/complex.ycp 2008-12-17 13:30:09.000000000 +0100
@@ -24,7 +24,7 @@
* Summary: Dialogs definitions
* Authors: Jiri Suchomel
*
- * $Id: complex.ycp 53823 2008-12-02 15:01:38Z jsuchome $
+ * $Id: complex.ycp 53843 2008-12-03 14:17:08Z jsuchome $
*/
{
@@ -693,7 +693,8 @@
list<map> content = AddOnCreator::content;
map product_xml = $[]; // used only when imported
mapproduct_info = AddOnCreator::product_info;
- boolean generate_release_package =AddOnCreator::generate_release_package;
+ boolean generate_release_package =
+ current_product["generate_release_package"]:false;
integer linguas_entry = -1;
// generate items for content file table
@@ -937,7 +938,8 @@
if (product_xml != $[])
AddOnCreator::product_xml = product_xml;
AddOnCreator::product_info = product_info;
- AddOnCreator::generate_release_package = generate_release_package;
+ AddOnCreator::current_product["generate_release_package"] =
+ generate_release_package;
break;
}
else if(ret == `abort || ret == `cancel) {
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-add-on-creator-2.17.8/VERSION new/yast2-add-on-creator-2.17.10/VERSION
--- old/yast2-add-on-creator-2.17.8/VERSION 2008-12-03 15:10:00.000000000 +0100
+++ new/yast2-add-on-creator-2.17.10/VERSION 2008-12-17 14:35:36.000000000 +0100
@@ -1 +1 @@
-2.17.8
+2.17.10
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org