Hello community,
here is the log from the commit of package yast2-packager
checked in at Tue Sep 11 18:34:11 CEST 2007.
--------
--- yast2-packager/yast2-packager.changes 2007-09-05 14:59:31.000000000 +0200
+++ /mounts/work_src_done/STABLE/yast2-packager/yast2-packager.changes 2007-09-11 16:07:26.000000000 +0200
@@ -1,0 +2,22 @@
+Tue Sep 11 16:02:49 CEST 2007 - locilka@suse.cz
+
+- Online repositories need to be added with unique alias (#309317).
+- Better error handling in checkmedia feature (#305495).
+- 2.15.77
+
+-------------------------------------------------------------------
+Tue Sep 11 15:41:07 CEST 2007 - lslezak@suse.cz
+
+- Properly create the progress popup in ncurses so it can be closed
+ at the end (#309376), fixed refresh in ncurses
+
+-------------------------------------------------------------------
+Mon Sep 10 10:55:07 CEST 2007 - locilka@suse.cz
+
+- Fixed SlideShow initialization, using Pkg::SourceProvideDirectory
+ instead of obsolete Pkg::SourceProvideDir (#305097).
+- Calling SetFocus in SourceDialogs for http, https, samba, and ftp
+ repositories to adjust the initial tab-order correctly (#305074).
+- 2.15.76
+
+-------------------------------------------------------------------
Old:
----
yast2-packager-2.15.75.tar.bz2
New:
----
yast2-packager-2.15.77.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-packager.spec ++++++
--- /var/tmp/diff_new_pack.e21611/_old 2007-09-11 18:34:04.000000000 +0200
+++ /var/tmp/diff_new_pack.e21611/_new 2007-09-11 18:34:04.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package yast2-packager (Version 2.15.75)
+# spec file for package yast2-packager (Version 2.15.77)
#
# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@@ -11,12 +11,12 @@
# norootforbuild
Name: yast2-packager
-Version: 2.15.75
+Version: 2.15.77
Release: 1
License: GPL v2 or later
Group: System/YaST
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: yast2-packager-2.15.75.tar.bz2
+Source0: yast2-packager-2.15.77.tar.bz2
prefix: /usr
BuildRequires: docbook-xsl-stylesheets doxygen gcc-c++ libxcrypt-devel libxslt perl-XML-Writer sgml-skel update-desktop-files yast2-country yast2-devtools yast2-slp yast2-testsuite yast2-xml
BuildRequires: yast2 >= 2.15.38
@@ -59,7 +59,7 @@
Arvin Schnell
%prep
-%setup -n yast2-packager-2.15.75
+%setup -n yast2-packager-2.15.77
%build
%{prefix}/bin/y2tool y2autoconf
@@ -100,6 +100,19 @@
%doc %{prefix}/share/doc/packages/yast2-packager
%changelog
+* Tue Sep 11 2007 - locilka@suse.cz
+- Online repositories need to be added with unique alias (#309317).
+- Better error handling in checkmedia feature (#305495).
+- 2.15.77
+* Tue Sep 11 2007 - lslezak@suse.cz
+- Properly create the progress popup in ncurses so it can be closed
+ at the end (#309376), fixed refresh in ncurses
+* Mon Sep 10 2007 - locilka@suse.cz
+- Fixed SlideShow initialization, using Pkg::SourceProvideDirectory
+ instead of obsolete Pkg::SourceProvideDir (#305097).
+- Calling SetFocus in SourceDialogs for http, https, samba, and ftp
+ repositories to adjust the initial tab-order correctly (#305074).
+- 2.15.76
* Wed Sep 05 2007 - locilka@suse.cz
- Reading and using proxy settings before inst_productsources
starts downloading files (#307680).
++++++ yast2-packager-2.15.75.tar.bz2 -> yast2-packager-2.15.77.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-packager-2.15.75/src/clients/inst_productsources.ycp new/yast2-packager-2.15.77/src/clients/inst_productsources.ycp
--- old/yast2-packager-2.15.75/src/clients/inst_productsources.ycp 2007-09-05 14:43:06.000000000 +0200
+++ new/yast2-packager-2.15.77/src/clients/inst_productsources.ycp 2007-09-11 16:01:33.000000000 +0200
@@ -124,7 +124,33 @@
return sformat ("(%1|%2)", s_url, s_path);
}
+ // See bugzilla #309317
+ string GetUniqueAlias (string alias_orig) {
+ if (alias_orig == nil) alias_orig = "";
+
+ // all current aliases
+ list <string> aliases = maplist (integer i, Pkg::SourceGetCurrent(false), {
+ map info = Pkg::SourceGeneralData (i);
+ return info["alias"]:"";
+ });
+
+ // default
+ string alias = alias_orig;
+
+ // repository alias must be unique
+ // if it already exists add "_<number>" suffix to it
+ integer idx = 1;
+ while (contains (aliases, alias)) {
+ alias = sformat("%1_%2", alias_orig, idx);
+ idx = idx + 1;
+ }
+ if (alias_orig != alias) {
+ y2milestone ("Alias '%1' changed to '%2'", alias_orig, alias);
+ }
+
+ return alias;
+ }
// See bugzilla #307680
// Proxy needs to be read from sysconfig and
@@ -1089,7 +1115,9 @@
"name" : repo_name,
"base_urls" : [url],
"prod_dir" : pth,
- "alias" : url,
+ // alias needs to be unique
+ // bugzilla #309317
+ "alias" : GetUniqueAlias (url),
"type" : repo_type,
]);
}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-packager-2.15.75/src/include/checkmedia/ui.ycp new/yast2-packager-2.15.77/src/include/checkmedia/ui.ycp
--- old/yast2-packager-2.15.75/src/include/checkmedia/ui.ycp 2007-08-23 09:58:37.000000000 +0200
+++ new/yast2-packager-2.15.77/src/include/checkmedia/ui.ycp 2007-09-11 16:04:50.000000000 +0200
@@ -8,7 +8,7 @@
* Authors:
* Ladislav Slezak
*
- * $Id: ui.ycp 40410 2007-08-22 14:33:10Z lslezak $
+ * $Id: ui.ycp 40853 2007-09-11 14:04:48Z locilka $
*
* All user interface functions.
*
@@ -140,8 +140,17 @@
if (instmode == "cd" || instmode == "dvd")
{
+ string cdrom_device = (string) SCR::Read(.etc.install_inf.Cdrom);
+
+ // bugzilla #305495
+ if (cdrom_device == nil || cdrom_device == "") {
+ y2error ("No Cdrom present in install.inf");
+ // try to recover
+ return true;
+ }
+
// get CD device name
- string bootcd = "/dev/" + (string)SCR::Read(.etc.install_inf.Cdrom);
+ string bootcd = "/dev/" + cdrom_device;
// is the device mounted?
list<map> mounts = (list<map>)SCR::Read(.proc.mounts);
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-packager-2.15.75/src/modules/PackageCallbacks.ycp new/yast2-packager-2.15.77/src/modules/PackageCallbacks.ycp
--- old/yast2-packager-2.15.75/src/modules/PackageCallbacks.ycp 2007-09-03 16:40:30.000000000 +0200
+++ new/yast2-packager-2.15.77/src/modules/PackageCallbacks.ycp 2007-09-11 16:07:53.000000000 +0200
@@ -7,7 +7,7 @@
*
* Purpose: provides the default Callbacks for Pkg::
*
- * $Id: PackageCallbacks.ycp 40722 2007-09-03 14:40:27Z lslezak $
+ * $Id: PackageCallbacks.ycp 40852 2007-09-11 13:43:32Z lslezak $
*
*/
@@ -2097,7 +2097,7 @@
else
{
string label = (tick_progress) ? tick_labels[current_tick]:"/" : sformat("%1: %2", progress_task, val_raw);
- progressw = `Label(label);
+ progressw = `ReplacePoint(`id(`rp_progress), `Label(`id(`progress_widget), label));
}
UI::OpenDialog(
@@ -2164,14 +2164,14 @@
else
{
string label = (tick_progress) ? tick_labels[current_tick]:"/" : sformat("%1: %2", progress_task, val_raw);
- progressw = `Label(label);
+ progressw = `Label(`id(`progress_widget), label);
}
// restart the animation only when at least 3 seconds elapsed,
// don't restart it too often
integer tm = time();
y2debug("Time elapsed since the last tick callback: %1", tm - tick_time);
- if (tm - tick_time > 3)
+ if (tm - tick_time > 3 || !UI::GetDisplayInfo()["HasAnimationSupport"]:true)
{
UI::ReplaceWidget (`id(`rp_progress), progressw );
tick_time = tm;
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-packager-2.15.75/src/modules/Packages.ycp new/yast2-packager-2.15.77/src/modules/Packages.ycp
--- old/yast2-packager-2.15.75/src/modules/Packages.ycp 2007-08-21 09:20:06.000000000 +0200
+++ new/yast2-packager-2.15.77/src/modules/Packages.ycp 2007-09-07 14:31:15.000000000 +0200
@@ -3,7 +3,7 @@
* Package: Package selections
* Authors: Anas Nashif
*
- * $Id: Packages.ycp 40225 2007-08-13 12:19:22Z lslezak $
+ * $Id: Packages.ycp 40803 2007-09-07 12:31:15Z locilka $
*/
{
@@ -808,28 +808,30 @@
// setup slidedir
map productmap = Pkg::SourceProductData (source);
string datadir = productmap["datadir"]:"suse";
- string slidedir_find = "/" + datadir + "/setup/slide";
- string dir = Pkg::SourceProvideOptionalFile (source, 1,
- slidedir_find + "/directory.yast");
- string slidedir = nil;
- if (dir != nil)
- slidedir = Pkg::SourceProvideDir (source, 1, slidedir_find);
-
- string our_slidedir = (string)WFM::Read (.local.tmpdir, "");
- if (slidedir == nil)
- {
- y2milestone("No slide directory '%1' found in repository '%2'.",
- slidedir_find, source);
- }
- else
- {
+
+ // media directory
+ // bugzilla #305097
+ string search_for_dir = sformat ("/%1/setup/slide/", datadir);
+ string slidedir = Pkg::SourceProvideDirectory (source, 1, search_for_dir, true, true);
+
+ // target slideshow directory
+ string our_slidedir = (string) WFM::Read (.local.tmpdir, "");
+
+ if (slidedir == nil) {
+ y2milestone ("No slide directory '%1' found in repository '%2'.",
+ search_for_dir, source);
+ } else {
// copy all files to our own copy
+ y2milestone ("Copying %1/* to %2/", slidedir, our_slidedir);
+
WFM::Execute (.local.bash,
sformat ("cp -r %1/* %2/", slidedir, our_slidedir)) ;
}
y2milestone ("Setting up the slide directory local copy: %1",
our_slidedir);
+
SlideShow::SetSlideDir (our_slidedir);
+
if (load_release_notes (source))
{
SlideShow::relnotes = media_prefix + media_text;
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-packager-2.15.75/src/modules/SourceDialogs.ycp new/yast2-packager-2.15.77/src/modules/SourceDialogs.ycp
--- old/yast2-packager-2.15.75/src/modules/SourceDialogs.ycp 2007-08-21 09:20:06.000000000 +0200
+++ new/yast2-packager-2.15.77/src/modules/SourceDialogs.ycp 2007-09-10 10:53:24.000000000 +0200
@@ -709,6 +709,19 @@
}
+void InitFocusServerInit (symbol server_type) {
+ switch (server_type) {
+ case (`ftp) : UI::SetFocus (`server);
+ break;
+ case (`http) : UI::SetFocus (`server);
+ break;
+ case (`https) : UI::SetFocus (`server);
+ break;
+ case (`samba) : UI::SetFocus (`server);
+ break;
+ }
+}
+
// HTTP(s)/FTP/SMB/CIFS repository widget
/**
@@ -802,6 +815,8 @@
if (UI::WidgetExists (`id (`workgroup)))
UI::ChangeWidget (`id (`workgroup), `Enabled, !anonymous);
+ InitFocusServerInit ((symbol) id);
+
return nil;
}
if (event["ID"]:nil == `anonymous)
@@ -905,6 +920,8 @@
UI::ChangeWidget(`id(`port), `Value, port_num);
}
}
+
+ InitFocusServerInit (type);
}
boolean ServerValidate (string key, map event) {
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-packager-2.15.75/VERSION new/yast2-packager-2.15.77/VERSION
--- old/yast2-packager-2.15.75/VERSION 2007-09-05 14:59:40.000000000 +0200
+++ new/yast2-packager-2.15.77/VERSION 2007-09-11 16:04:24.000000000 +0200
@@ -1 +1 @@
-2.15.75
+2.15.77
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org