Hello community,
here is the log from the commit of package yast2-packager
checked in at Thu Aug 9 23:15:19 CEST 2007.
--------
--- yast2-packager/yast2-packager.changes 2007-08-06 16:58:29.000000000 +0200
+++ /mounts/work_src_done/STABLE/yast2-packager/yast2-packager.changes 2007-08-08 17:08:03.234022000 +0200
@@ -1,0 +2,35 @@
+Wed Aug 8 17:02:28 CEST 2007 - lslezak@suse.cz
+
+- shorten URL used as alias or name
+- 2.15.56
+
+-------------------------------------------------------------------
+Wed Aug 8 16:29:34 CEST 2007 - locilka@suse.cz
+
+- Fixed adding Internet repositories to be able to use them during
+ installation (#298422).
+- Adapted Internet repositories client to preselect recommended
+ repositories for the first run of the client in installation
+ and to sort by the 'recommended' tag in installation (#297628).
+
+-------------------------------------------------------------------
+Wed Aug 8 12:56:07 CEST 2007 - jsrain@suse.cz
+
+- updated prefix to release notes during installation slideshow
+ (#296433)
+
+-------------------------------------------------------------------
+Wed Aug 8 10:45:35 CEST 2007 - lslezak@suse.cz
+
+- do not loose the repository name when adding has failed (#297774)
+- fixed repository editing when download has failed
+
+-------------------------------------------------------------------
+Mon Aug 6 18:43:44 CEST 2007 - lslezak@suse.cz
+
+- properly detect ISO image (disable autorefresh)
+- show download progress when installing packages (#297843)
+- allow entering an IP address in the server name widget (#288445)
+- 2.15.55
+
+-------------------------------------------------------------------
Old:
----
yast2-packager-2.15.54.tar.bz2
New:
----
yast2-packager-2.15.56.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-packager.spec ++++++
--- /var/tmp/diff_new_pack.w24136/_old 2007-08-09 23:13:57.000000000 +0200
+++ /var/tmp/diff_new_pack.w24136/_new 2007-08-09 23:13:57.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package yast2-packager (Version 2.15.54)
+# spec file for package yast2-packager (Version 2.15.56)
#
# 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.54
+Version: 2.15.56
Release: 1
License: GPL v2 or later
Group: System/YaST
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: yast2-packager-2.15.54.tar.bz2
+Source0: yast2-packager-2.15.56.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
@@ -55,7 +55,7 @@
Arvin Schnell
%prep
-%setup -n yast2-packager-2.15.54
+%setup -n yast2-packager-2.15.56
%build
%{prefix}/bin/y2tool y2autoconf
@@ -96,6 +96,26 @@
%doc %{prefix}/share/doc/packages/yast2-packager
%changelog
+* Wed Aug 08 2007 - lslezak@suse.cz
+- shorten URL used as alias or name
+- 2.15.56
+* Wed Aug 08 2007 - locilka@suse.cz
+- Fixed adding Internet repositories to be able to use them during
+ installation (#298422).
+- Adapted Internet repositories client to preselect recommended
+ repositories for the first run of the client in installation
+ and to sort by the 'recommended' tag in installation (#297628).
+* Wed Aug 08 2007 - jsrain@suse.cz
+- updated prefix to release notes during installation slideshow
+ (#296433)
+* Wed Aug 08 2007 - lslezak@suse.cz
+- do not loose the repository name when adding has failed (#297774)
+- fixed repository editing when download has failed
+* Mon Aug 06 2007 - lslezak@suse.cz
+- properly detect ISO image (disable autorefresh)
+- show download progress when installing packages (#297843)
+- allow entering an IP address in the server name widget (#288445)
+- 2.15.55
* Mon Aug 06 2007 - lslezak@suse.cz
- fixed repository probing (merging URL and product directory has
been moved to pkg-bindings)
++++++ yast2-packager-2.15.54.tar.bz2 -> yast2-packager-2.15.56.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-packager-2.15.54/configure new/yast2-packager-2.15.56/configure
--- old/yast2-packager-2.15.54/configure 2007-08-06 16:57:34.000000000 +0200
+++ new/yast2-packager-2.15.56/configure 2007-08-08 17:05:17.000000000 +0200
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.60 for yast2-packager 2.15.54.
+# Generated by GNU Autoconf 2.60 for yast2-packager 2.15.56.
#
# Report bugs to http://bugs.opensuse.org/.
#
@@ -559,8 +559,8 @@
# Identity of this package.
PACKAGE_NAME='yast2-packager'
PACKAGE_TARNAME='yast2-packager'
-PACKAGE_VERSION='2.15.54'
-PACKAGE_STRING='yast2-packager 2.15.54'
+PACKAGE_VERSION='2.15.56'
+PACKAGE_STRING='yast2-packager 2.15.56'
PACKAGE_BUGREPORT='http://bugs.opensuse.org/'
ac_unique_file="RPMNAME"
@@ -1181,7 +1181,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-packager 2.15.54 to adapt to many kinds of systems.
+\`configure' configures yast2-packager 2.15.56 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1252,7 +1252,7 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of yast2-packager 2.15.54:";;
+ short | recursive ) echo "Configuration of yast2-packager 2.15.56:";;
esac
cat <<\_ACEOF
@@ -1330,7 +1330,7 @@
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-yast2-packager configure 2.15.54
+yast2-packager configure 2.15.56
generated by GNU Autoconf 2.60
Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -1344,7 +1344,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-packager $as_me 2.15.54, which was
+It was created by yast2-packager $as_me 2.15.56, which was
generated by GNU Autoconf 2.60. Invocation command line was
$ $0 $@
@@ -2145,7 +2145,7 @@
# Define the identity of the package.
PACKAGE='yast2-packager'
- VERSION='2.15.54'
+ VERSION='2.15.56'
cat >>confdefs.h <<_ACEOF
@@ -2372,7 +2372,7 @@
-VERSION="2.15.54"
+VERSION="2.15.56"
RPMNAME="yast2-packager"
MAINTAINER="Ladislav Slezak "
@@ -3260,7 +3260,7 @@
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by yast2-packager $as_me 2.15.54, which was
+This file was extended by yast2-packager $as_me 2.15.56, which was
generated by GNU Autoconf 2.60. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -3303,7 +3303,7 @@
_ACEOF
cat >>$CONFIG_STATUS <<_ACEOF
ac_cs_version="\\
-yast2-packager config.status 2.15.54
+yast2-packager config.status 2.15.56
configured by $0, generated by GNU Autoconf 2.60,
with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-packager-2.15.54/configure.in new/yast2-packager-2.15.56/configure.in
--- old/yast2-packager-2.15.54/configure.in 2007-08-06 16:57:30.000000000 +0200
+++ new/yast2-packager-2.15.56/configure.in 2007-08-08 17:05:11.000000000 +0200
@@ -3,7 +3,7 @@
dnl -- This file is generated by y2autoconf 2.14.0 - DO NOT EDIT! --
dnl (edit configure.in.in instead)
-AC_INIT(yast2-packager, 2.15.54, http://bugs.opensuse.org/, yast2-packager)
+AC_INIT(yast2-packager, 2.15.56, http://bugs.opensuse.org/, yast2-packager)
dnl Check for presence of file 'RPMNAME'
AC_CONFIG_SRCDIR([RPMNAME])
@@ -17,7 +17,7 @@
AM_INIT_AUTOMAKE(tar-ustar) dnl searches for some needed programs
dnl Important YaST2 variables
-VERSION="2.15.54"
+VERSION="2.15.56"
RPMNAME="yast2-packager"
MAINTAINER="Ladislav Slezak "
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-packager-2.15.54/src/clients/inst_productsources.ycp new/yast2-packager-2.15.56/src/clients/inst_productsources.ycp
--- old/yast2-packager-2.15.54/src/clients/inst_productsources.ycp 2007-08-06 14:33:49.000000000 +0200
+++ new/yast2-packager-2.15.56/src/clients/inst_productsources.ycp 2007-08-08 16:58:15.000000000 +0200
@@ -77,6 +77,7 @@
import "GetInstArgs";
import "OneClickInstallStandard";
import "Language";
+ import "String";
include "installation/misc.ycp";
@@ -85,6 +86,9 @@
return `back;
}
+ // (Applicable only in inst-sys)
+ boolean preselect_recommended = true;
+
string main_link = "";
map list_of_repos = $[];
@@ -434,6 +438,25 @@
return `nosources;
}
+
+ // In the installation, recommended repositories will be preselected
+ if (Stage::initial()) {
+ // Set preselect_recommended to the correct state
+ string filename = sformat ("%1/productsources_already_called", Directory::tmpdir);
+
+ // Client must have been already called
+ if (FileUtils::Exists (filename)) {
+ preselect_recommended = false;
+ // Really for the very first time
+ } else {
+ preselect_recommended = true;
+ SCR::Execute (.target.bash, sformat ("touch '%1'", String::Quote (filename)));
+ y2milestone ("Running for the first time...");
+ }
+ // ...but never on the running system
+ } else {
+ preselect_recommended = false;
+ }
Progress::NextStage();
@@ -533,6 +556,19 @@
return;
}
+ string recommended = (list_of_repos[current_id, "recommended"]:false == true ?
+ sformat(
+ // TRANSLATORS: HTML-formatted summary text
+ // %1 is replaced with "Yes" (currently only "Yes")
+ // see *4
+ _("<b>Recommended:</b> %1<br>"),
+ // TRANSLATORS: used for "Recommended: Yes" (see *4)
+ _("Yes")
+ )
+ :
+ ""
+ );
+
string description = sformat (
// TRANSLATORS: This is a complex HTML-formatted information about selecetd external repository
// It contains "key: value" pair, one per line, separated by <br> tags
@@ -540,16 +576,19 @@
// %2 is replaced with an URL from which we've got this repository information
// %3 is replaced with a summary text for the selected repository
// %4 is replaced with a description text for the selected repository
+ // %5 is replaced with an emty string or "Recommended: Yes" (*4)
_("<p>
<b>URL:</b> %1<br>
<b>Linked from:</b> %2<br>
<b>Summary:</b> %3<br>
-<b>Description:</b> %4
+<b>Description:</b> %4<br>
+%5
</p>"),
list_of_repos[current_id, "url"]:"",
list_of_repos[current_id, "url_from"]:"",
GetLocalizedString (current_id, ["summary", "name"]),
- GetLocalizedString (current_id, ["description"])
+ GetLocalizedString (current_id, ["description"]),
+ recommended
);
UI::ChangeWidget (`id ("addon_description"), `Value, description);
@@ -565,14 +604,60 @@
return contains (already_selected_in_dialog, repo_id);
}
- void InitRopositoriesWidget (string filter_string) {
+ // visible but not selected items
+ // used for filter together with recommended repos
+ // not to select them 'again' when filter matches
+ list <string> currently_NOT_selected = [];
+
+ /*
+ * This function fills up the table repositories found on a web servers
+ * linked from control file.
+ *
+ * Order of appearance:
+ * Running system: sorted by repository name
+ * Inst-Sys: sorted by "recommended tag", then by name
+ *
+ * Preselections:
+ * Running sustem: no repositories are preselected
+ * Inst-Sys: "recommended" repositories are prelected
+ * but only for the first time when running this client
+ *
+ * @see bugzilla #297628
+ */
+ void InitRopositoriesWidget (string filter_string, boolean first_init, string current_item) {
list <term> items = [];
-
+ list <string> recommended_items = [];
repos_visible_now = [];
+ integer counter = -1;
+
+ // used for recommended repos
+ boolean some_repo_already_selected = false;
+
+// boolean current_item_is_listed = false;
- integer counter = -1;
foreach (string url, map one_repo, list_of_repos, {
- // do filter
+ string repo_id = CreateRepoId (one_repo["url"]:"", one_repo["path"]:"/");
+ integer src_id = IsAddOnAlreadySelected (one_repo["url"]:"", one_repo["path"]:"/");
+ boolean already_used = false;
+
+ // repository has been already initialized
+ if (src_id > -1) {
+ repos_already_used[repo_id] = src_id;
+ already_used = true;
+ // repository has been already selected
+ } else if (IsSelectedInDialog (repo_id)) {
+ already_used = true;
+ }
+
+ // If this variable is true, no recoomended repos are preselected
+ if (already_used) {
+ some_repo_already_selected = true;
+ // List of not-selected repos
+ } else if (! first_init) {
+ currently_NOT_selected = add (currently_NOT_selected, repo_id);
+ }
+
+ // do filter (filter after some_repo_already_selected is set)
if (filter_string != "") {
// neither "url" nor "name" matching
if (
@@ -590,19 +675,23 @@
return;
}
- string repo_id = CreateRepoId (one_repo["url"]:"", one_repo["path"]:"/");
- integer src_id = IsAddOnAlreadySelected (one_repo["url"]:"", one_repo["path"]:"/");
- boolean already_used = false;
+ boolean recommended = false;
- // repository has been already initialized
- if (src_id > -1) {
- repos_already_used[repo_id] = src_id;
- already_used = true;
- // repository has been already selected
- } else if (IsSelectedInDialog (repo_id)) {
- already_used = true;
+ // Only in stage initial and if no other repository is selected:
+ // preselect recommended repositories...
+ // always fill-up this list -- later used for sorting using 'recommended' tag
+ // Bugzilla #297628
+ if (Stage::initial()) {
+ recommended = one_repo["recommended"]:false;
+ if (recommended) {
+ recommended_items = add (recommended_items, repo_id);
+ }
}
+// // was 'current' and remains 'current'
+// if (repo_id == current_item)
+// current_item_is_listed = true;
+
items[counter] = `item (
`id (repo_id),
GetLocalizedString (repo_id, ["name", "url"]),
@@ -612,12 +701,47 @@
repos_visible_now[counter] = repo_id;
});
- // FIXME: use lsort instead
items = sort (term one_item_a, term one_item_b, items, ``(one_item_a[1]:"" < one_item_b[1]:""));
+ // Preselect the recommended repositories when ne repository has been selected yet
+ if (preselect_recommended) {
+ list <term> tmp_items = items;
+ integer counter = -1;
+ string current_repoid = "";
+
+ foreach (term one_item, tmp_items, {
+ counter = counter + 1;
+ current_repoid = one_item[0,0]:"---";
+
+ // recommended_items contain list of all recommended items (visible on the screen)
+ if (contains (recommended_items, current_repoid)) {
+ y2milestone ("Preselecting: %1", current_repoid);
+ one_item[2] = true;
+ items[counter] = one_item;
+ }
+ });
+ }
+
+ // In the initial stage, repos are additionally sorted whether they are recommended or not
+ if (Stage::initial()) {
+ items = sort (term one_item_a, term one_item_b, items, ``(
+ contains (recommended_items, one_item_a[0,0]:"") > contains (recommended_items, one_item_b[0,0]:"")
+ ));
+ }
+
UI::ChangeWidget (`id ("addon_repos"), `Items, items);
+// disabled
+// if (current_item_is_listed) {
+// UI::ChangeWidget (`id ("addon_repos"), `CurrentItem, current_item);
+// } else if (size (items) > 0) {
+// UI::ChangeWidget (`id ("addon_repos"), `CurrentItem, items[0,0,0]:"");
+// }
+
PrintRepositoryDescription();
+
+ // Preselect recommended repos only once
+ preselect_recommended = false;
}
void StoreSelectedInDialog () {
@@ -711,10 +835,12 @@
StoreSelectedInDialog();
string filter_string = (string) UI::QueryWidget (`id ("filter_text"), `Value);
+ string current_item = (string) UI::QueryWidget (`id ("addon_repos"), `CurrentItem);
+
filter_string = EscapeChars (filter_string);
filter_string = MakeCaseInsensitiveRegexp (filter_string);
- InitRopositoriesWidget (filter_string);
+ InitRopositoriesWidget (filter_string, false, current_item);
UI::SetFocus (`id ("filter_text"));
}
@@ -771,7 +897,7 @@
}
repos_already_used = $[];
- InitRopositoriesWidget ("");
+ InitRopositoriesWidget ("", true, nil);
any dialog_ret = nil;
@@ -816,7 +942,7 @@
boolean CreateSource (string url, string pth, string repo_name) {
integer src_id = Pkg::RepositoryAdd ($[
- "enabled" : true,
+ "enabled" : false,
"name" : repo_name,
"base_urls" : [url],
"prod_dir" : pth,
@@ -841,6 +967,8 @@
Pkg::SourceRefreshNow (src_id);
+ Pkg::SourceSetEnabled (src_id, true);
+
if (Stage::initial()) {
AddOnProduct::Integrate (src_id);
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-packager-2.15.54/src/clients/inst_source.ycp new/yast2-packager-2.15.56/src/clients/inst_source.ycp
--- old/yast2-packager-2.15.54/src/clients/inst_source.ycp 2007-08-06 15:09:32.000000000 +0200
+++ new/yast2-packager-2.15.56/src/clients/inst_source.ycp 2007-08-08 17:04:00.000000000 +0200
@@ -6,7 +6,7 @@
* Purpose:
* Adding, removing and prioritizing of repositories for packagemanager.
*
- * $Id: inst_source.ycp 40000 2007-08-06 13:09:31Z lslezak $
+ * $Id: inst_source.ycp 40107 2007-08-08 15:03:59Z lslezak $
*
*/
@@ -186,15 +186,23 @@
if (size(new_repos) == 0)
{
// use url as the name
- new_repos = [ [ url, "/" ] ];
+ string url_name = url;
+
+ // limit alias and name lenght to 25 characters
+ if (size(url_name) > 25)
+ {
+ url_name = URL::FormatURL(URL::Parse(url), 25);
+ }
+
+ new_repos = [ [ url_name, "/" ] ];
}
list<integer> newSources = [];
boolean auto_refresh = true;
// disable autorefresh for ISO images
- const string iso_suffix = ".iso";
- if (substring(url, size(url) - size(iso_suffix), size(iso_suffix)) == iso_suffix)
+ const string iso_prefix = "iso:";
+ if (substring(url, 0, size(iso_prefix)) == iso_prefix)
{
y2milestone("ISO image detected, disabling autorefresh (%1)", url);
auto_refresh = false;
@@ -664,9 +672,12 @@
{
map generalData = Pkg::SourceGeneralData( id );
string url = generalData[ "url" ]:"";
+ string old_url = url;
boolean auto_refresh = sourceState["autorefresh"]:true;
boolean plaindir = generalData["type"]:"YaST" == plaindir_type;
+ SourceDialogs::SetRepoName (sourceState["name"]:"");
+
do {
// change schema if the repository type is plaindir
// to show the right popup dialog
@@ -676,8 +687,6 @@
parsed["scheme"] = "pkg";
url = URL::Build(parsed);
}
- SourceDialogs::SetRepoName (sourceState["name"]:"");
- string old_url = url;
url = editUrl( url );
if ( size( url ) == 0 ) break;
@@ -876,7 +885,6 @@
symbol EditDialog()
{
- SourceDialogs::SetRepoName ("");
symbol ret = SourceDialogs::EditDialog ();
return ret;
}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-packager-2.15.54/src/include/load_release_notes.ycp new/yast2-packager-2.15.56/src/include/load_release_notes.ycp
--- old/yast2-packager-2.15.54/src/include/load_release_notes.ycp 2007-07-30 12:53:47.000000000 +0200
+++ new/yast2-packager-2.15.56/src/include/load_release_notes.ycp 2007-08-08 13:06:51.000000000 +0200
@@ -53,10 +53,10 @@
return false;
};
- string media_prefix =
+ string media_prefix =
// beginning of the rich text with the release notes
_("<p><b>These are the release notes made for the first initial release. They are
-part of the installation media. During installation, if a connection
+part of the installation media. During the configuration steps, if a connection
to the Internet is available, you can download updated release notes
from the SUSE Linux Web server.</b></p>");
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-packager-2.15.54/src/modules/SlideShowCallbacks.ycp new/yast2-packager-2.15.56/src/modules/SlideShowCallbacks.ycp
--- old/yast2-packager-2.15.54/src/modules/SlideShowCallbacks.ycp 2007-07-19 13:46:49.000000000 +0200
+++ new/yast2-packager-2.15.56/src/modules/SlideShowCallbacks.ycp 2007-08-08 09:13:34.000000000 +0200
@@ -6,7 +6,7 @@
*
* Purpose: provides the Callbacks for SlideShow
*
- * $Id: SlideShowCallbacks.ycp 39526 2007-07-19 11:46:47Z lslezak $
+ * $Id: SlideShowCallbacks.ycp 40068 2007-08-08 07:13:34Z lslezak $
*
*/
@@ -102,6 +102,11 @@
return ! SlideShow::GetUserAbort();
}
+ global boolean ProgressDownload(integer percent, integer dummy)
+ {
+ return ProgressProvide(percent);
+ }
+
/**
* during file providal
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-packager-2.15.54/src/modules/SlideShow.ycp new/yast2-packager-2.15.56/src/modules/SlideShow.ycp
--- old/yast2-packager-2.15.54/src/modules/SlideShow.ycp 2007-07-30 12:53:47.000000000 +0200
+++ new/yast2-packager-2.15.56/src/modules/SlideShow.ycp 2007-08-08 09:13:34.000000000 +0200
@@ -5,7 +5,7 @@
*
* Author: Stefan Hundhammer
*
- * $Id: SlideShow.ycp 39763 2007-07-30 10:47:35Z jsrain $
+ * $Id: SlideShow.ycp 40068 2007-08-08 07:13:34Z lslezak $
*
*/
{
@@ -686,7 +686,8 @@
if ( UI::WidgetExists(`progressCurrentPackage) )
{
- UI::ChangeWidget(`progressCurrentPackage, `Label, pkg_name);
+ UI::ChangeWidget(`progressCurrentPackage, `Label, remote ?
+ sformat(_("Downloading %1 (download size %2)"), pkg_name, String::FormatSize(sz)) : pkg_name);
UI::ChangeWidget(`progressCurrentPackage, `Value, 0);
}
//
@@ -1856,6 +1857,7 @@
Pkg::CallbackStartProvide ("SlideShowCallbacks::StartProvide");
Pkg::CallbackProgressProvide ("SlideShowCallbacks::ProgressProvide");
Pkg::CallbackDoneProvide ("SlideShowCallbacks::DoneProvide");
+ Pkg::CallbackProgressDownload("SlideShowCallbacks::ProgressDownload");
Pkg::CallbackSourceChange ("SlideShowCallbacks::CallbackSourceChange");
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-packager-2.15.54/src/modules/SourceDialogs.ycp new/yast2-packager-2.15.56/src/modules/SourceDialogs.ycp
--- old/yast2-packager-2.15.54/src/modules/SourceDialogs.ycp 2007-08-02 11:01:06.000000000 +0200
+++ new/yast2-packager-2.15.56/src/modules/SourceDialogs.ycp 2007-08-08 10:24:29.000000000 +0200
@@ -28,6 +28,7 @@
import "NetworkPopup";
import "String";
import "Hostname";
+import "IP";
// common functions / data
@@ -908,9 +909,12 @@
string host = NormalizeHost ((string)UI::QueryWidget (`id (`server), `Value));
if (! Hostname::CheckFQ (host))
{
- UI::SetFocus (`server);
- Popup::Message (Hostname::ValidFQ ());
- return false;
+ if (!IP::Check(host))
+ {
+ UI::SetFocus (`server);
+ Popup::Error(sformat("%1\n\n%2", Hostname::ValidFQ (), IP::Valid4()));
+ return false;
+ }
}
return true;
@@ -1226,6 +1230,7 @@
void SelectStore (string key, map event) {
_url = "";
+ _repo_name = "";
symbol selected = (symbol)UI::QueryWidget (`id (`type), `CurrentButton);
if (contains ([`ftp, `http, `https, `samba, `nfs, `cd, `dvd,
`local_dir, `specify__url, `slp, `local_iso], selected))
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-packager-2.15.54/VERSION new/yast2-packager-2.15.56/VERSION
--- old/yast2-packager-2.15.54/VERSION 2007-08-06 16:56:09.000000000 +0200
+++ new/yast2-packager-2.15.56/VERSION 2007-08-08 16:58:15.000000000 +0200
@@ -1 +1 @@
-2.15.54
+2.15.56
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org