Author: jsuchome
Date: Thu Aug 23 14:45:45 2007
New Revision: 40432
URL: http://svn.opensuse.org/viewcvs/yast?rev=40432&view=rev
Log:
- copy packages with different architectures to correct
directories (#302439)
- reset the settings after returning to the first step (#302407)
- 2.15.20
Modified:
trunk/add-on-creator/VERSION
trunk/add-on-creator/package/yast2-add-on-creator.changes
trunk/add-on-creator/src/AddOnCreator.ycp
trunk/add-on-creator/src/complex.ycp
Modified: trunk/add-on-creator/VERSION
URL: http://svn.opensuse.org/viewcvs/yast/trunk/add-on-creator/VERSION?rev=40432&r1=40431&r2=40432&view=diff
==============================================================================
--- trunk/add-on-creator/VERSION (original)
+++ trunk/add-on-creator/VERSION Thu Aug 23 14:45:45 2007
@@ -1 +1 @@
-2.15.19
+2.15.20
Modified: trunk/add-on-creator/package/yast2-add-on-creator.changes
URL: http://svn.opensuse.org/viewcvs/yast/trunk/add-on-creator/package/yast2-add-on-creator.changes?rev=40432&r1=40431&r2=40432&view=diff
==============================================================================
--- trunk/add-on-creator/package/yast2-add-on-creator.changes (original)
+++ trunk/add-on-creator/package/yast2-add-on-creator.changes Thu Aug 23 14:45:45 2007
@@ -1,4 +1,12 @@
-------------------------------------------------------------------
+Thu Aug 23 14:34:17 CEST 2007 - jsuchome@suse.cz
+
+- copy packages with different architectures to correct
+ directories (#302439)
+- reset the settings after returning to the first step (#302407)
+- 2.15.20
+
+-------------------------------------------------------------------
Fri Aug 10 12:47:53 CEST 2007 - jsuchome@suse.cz
- licenses written to /license.tar.gz (F302018)
Modified: trunk/add-on-creator/src/AddOnCreator.ycp
URL: http://svn.opensuse.org/viewcvs/yast/trunk/add-on-creator/src/AddOnCreator.ycp?rev=40432&r1=40431&r2=40432&view=diff
==============================================================================
--- trunk/add-on-creator/src/AddOnCreator.ycp (original)
+++ trunk/add-on-creator/src/AddOnCreator.ycp Thu Aug 23 14:45:45 2007
@@ -627,10 +627,10 @@
global map available_packages = $[];
// mapping of package name to full file name
-global map package2filename = $[];
+global map package2filename = $[];
// mapping of source package name to full file name
-global map srcpackage2filename = $[];
+global map srcpackage2filename = $[];
// if we want only to sign existing product (and possibly create iso of it)
global boolean only_sign_product = false;
@@ -1103,10 +1103,14 @@
{
available_packages[arch] = add (
available_packages[arch]:[], name);
+ if (!haskey (package2filename, arch))
+ package2filename[arch] = $[];
+ if (!haskey (srcpackage2filename, arch))
+ srcpackage2filename[arch] = $[];
if (arch != "src")
- package2filename[name] = f;
+ package2filename[arch,name] = f;
else
- srcpackage2filename[name] = f;
+ srcpackage2filename[arch,name] = f;
}
});
y2milestone ("... done");
@@ -1592,14 +1596,14 @@
{
foreach (string p, (list<string>) pa, {
SCR::Execute (.target.bash, sformat (
- "/bin/cp %1 '%2/'", package2filename[p]:"", out_dir));
+ "/bin/cp %1 '%2/'", package2filename[arch,p]:"", out_dir));
});
}
else if (size (srcpackage2filename) > 0 && arch == "src")
{
foreach (string p, (list<string>) pa, {
SCR::Execute (.target.bash, sformat (
- "/bin/cp %1 '%2/'", srcpackage2filename[p]:"", out_dir));
+ "/bin/cp %1 '%2/'", srcpackage2filename[arch,p]:"", out_dir));
});
}
else
Modified: trunk/add-on-creator/src/complex.ycp
URL: http://svn.opensuse.org/viewcvs/yast/trunk/add-on-creator/src/complex.ycp?rev=40432&r1=40431&r2=40432&view=diff
==============================================================================
--- trunk/add-on-creator/src/complex.ycp (original)
+++ trunk/add-on-creator/src/complex.ycp Thu Aug 23 14:45:45 2007
@@ -92,6 +92,10 @@
return ret ? `next : `abort;
}
+/**
+ * The first dialog in the Add-On creating wizard
+ * (select either creating new product or cloning existing one)
+ */
any StartDialog () {
// dialog caption
@@ -100,8 +104,6 @@
term contents = `HVCenter (`HBox (`HSpacing (), `VBox (
`VSpacing (0.8),
- // label
-// `Left (`Label (_("Create a New Add-On Product"))),
`RadioButtonGroup (`id(`rd), `Left(`HVSquash(`VBox (
`Left (`RadioButton(`id(`new), `opt (`notify),
// radio button label
@@ -187,6 +189,44 @@
}
}
Wizard::RestoreBackButton();
+ if (ret != `copy)
+ {
+ // reset possible previous settings
+ AddOnCreator::content = [];
+ AddOnCreator::content_map = $[];
+ AddOnCreator::rpm_path = "";
+ AddOnCreator::required_rpm_path = "";
+ AddOnCreator::patterns = $[];
+ AddOnCreator::packages_descr = $[];
+ AddOnCreator::license = "";
+ AddOnCreator::products_files = [];
+ AddOnCreator::media_files = [];
+ AddOnCreator::patches_files = [];
+ AddOnCreator::info = "";
+ AddOnCreator::extra_prov = "";
+ AddOnCreator::extra_prov_file = "";
+ AddOnCreator::nextmedia = "";
+ AddOnCreator::readme_files = $[ "README" : "" ];
+ AddOnCreator::license_files = $[ "license" : "" ];
+ AddOnCreator::copying_files = $[ "COPYING" : "" ];
+ AddOnCreator::copyright_files = $[ "COPYRIGHT": "" ];
+ AddOnCreator::y2update_packages = [];
+ AddOnCreator::y2update_path = "";
+ AddOnCreator::workflow_path = "";
+ AddOnCreator::generate_descriptions = false;
+ AddOnCreator::iso = false;
+ AddOnCreator::iso_path = "";
+ AddOnCreator::iso_name = "";
+ AddOnCreator::bootable = false;
+ AddOnCreator::clone = false;
+ AddOnCreator::import_path = "";
+ AddOnCreator::base_output_path = "";
+ AddOnCreator::passphrase = "";
+ AddOnCreator::available_packages = $[];
+ AddOnCreator::package2filename = $[];
+ AddOnCreator::srcpackage2filename = $[];
+ AddOnCreator::resign_packages = false;
+ }
return ret;
}
--
To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org
For additional commands, e-mail: yast-commit+help@opensuse.org