Hello community,
here is the log from the commit of package yast2-packager
checked in at Thu Mar 27 23:58:47 CET 2008.
--------
--- yast2-packager/yast2-packager.changes 2008-03-26 15:24:21.000000000 +0100
+++ /mounts/work_src_done/STABLE/yast2-packager/yast2-packager.changes 2008-03-27 15:37:27.299530000 +0100
@@ -1,0 +2,15 @@
+Thu Mar 27 11:42:17 CET 2008 - lslezak@suse.cz
+
+- repositories - display and edit priorities (bnc#369827)
+- repositories - preselect "URL" type when adding a new repository
+ (bnc#301659)
+- 2.16.29
+
+-------------------------------------------------------------------
+Wed Mar 26 16:08:59 CET 2008 - lslezak@suse.cz
+
+- media check - added "Eject" button (bnc#294097)
+- repositories - initialize the target in the standalone mode
+ to load GPG keys
+
+-------------------------------------------------------------------
Old:
----
yast2-packager-2.16.28.tar.bz2
New:
----
yast2-packager-2.16.29.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-packager.spec ++++++
--- /var/tmp/diff_new_pack.s26997/_old 2008-03-27 23:56:11.000000000 +0100
+++ /var/tmp/diff_new_pack.s26997/_new 2008-03-27 23:56:11.000000000 +0100
@@ -1,5 +1,5 @@
#
-# spec file for package yast2-packager (Version 2.16.28)
+# spec file for package yast2-packager (Version 2.16.29)
#
# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@@ -12,25 +12,25 @@
Name: yast2-packager
-Version: 2.16.28
+Version: 2.16.29
Release: 1
License: GPL v2 or later
Group: System/YaST
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: yast2-packager-2.16.28.tar.bz2
+Source0: yast2-packager-2.16.29.tar.bz2
Prefix: /usr
BuildRequires: gcc-c++ libxcrypt-devel perl-XML-Writer update-desktop-files yast2-country-data yast2-devtools yast2-slp yast2-testsuite yast2-xml
# enhanced String::FormatRateMessage()
BuildRequires: yast2 >= 2.16.34
-# changed signature of MediaChange calback
-BuildRequires: yast2-pkg-bindings >= 2.16.20
+# "priority" support
+BuildRequires: yast2-pkg-bindings >= 2.16.22
# Module: OneClickInstallStandard
Requires: perl-XML-Bare yast2-perl-bindings
# Newly added RPM
Requires: yast2-country-data >= 2.16.3
Requires: yast2-installation >= 2.15.12
-# changed signature of MediaChange calback
-Requires: yast2-pkg-bindings >= 2.16.20
+# "priority" support
+Requires: yast2-pkg-bindings >= 2.16.22
# URL::MakeParamsFromMap and URL::MakeMapFromParams
Requires: yast2 >= 2.16.25
# unzipping license file
@@ -70,7 +70,7 @@
Arvin Schnell
%prep
-%setup -n yast2-packager-2.16.28
+%setup -n yast2-packager-2.16.29
%build
%{prefix}/bin/y2tool y2autoconf
@@ -105,7 +105,17 @@
/usr/share/YaST2/scrconf/*
%{prefix}/lib/YaST2/servers_non_y2/ag_*
%doc %{prefix}/share/doc/packages/yast2-packager
+
%changelog
+* Thu Mar 27 2008 lslezak@suse.cz
+- repositories - display and edit priorities (bnc#369827)
+- repositories - preselect "URL" type when adding a new repository
+ (bnc#301659)
+- 2.16.29
+* Wed Mar 26 2008 lslezak@suse.cz
+- media check - added "Eject" button (bnc#294097)
+- repositories - initialize the target in the standalone mode
+ to load GPG keys
* Wed Mar 26 2008 lslezak@suse.cz
- media check - updated and improved help text (bnc#132881)
- repositories - URL can be selected and copied (bnc#334757)
++++++ yast2-packager-2.16.28.tar.bz2 -> yast2-packager-2.16.29.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-packager-2.16.28/configure new/yast2-packager-2.16.29/configure
--- old/yast2-packager-2.16.28/configure 2008-03-26 15:23:28.000000000 +0100
+++ new/yast2-packager-2.16.29/configure 2008-03-27 15:36: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-packager 2.16.28.
+# Generated by GNU Autoconf 2.61 for yast2-packager 2.16.29.
#
# Report bugs to http://bugs.opensuse.org/.
#
@@ -574,8 +574,8 @@
# Identity of this package.
PACKAGE_NAME='yast2-packager'
PACKAGE_TARNAME='yast2-packager'
-PACKAGE_VERSION='2.16.28'
-PACKAGE_STRING='yast2-packager 2.16.28'
+PACKAGE_VERSION='2.16.29'
+PACKAGE_STRING='yast2-packager 2.16.29'
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-packager 2.16.28 to adapt to many kinds of systems.
+\`configure' configures yast2-packager 2.16.29 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-packager 2.16.28:";;
+ short | recursive ) echo "Configuration of yast2-packager 2.16.29:";;
esac
cat <<\_ACEOF
@@ -1346,7 +1346,7 @@
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-yast2-packager configure 2.16.28
+yast2-packager configure 2.16.29
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-packager $as_me 2.16.28, which was
+It was created by yast2-packager $as_me 2.16.29, 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-packager'
- VERSION='2.16.28'
+ VERSION='2.16.29'
cat >>confdefs.h <<_ACEOF
@@ -2409,7 +2409,7 @@
-VERSION="2.16.28"
+VERSION="2.16.29"
RPMNAME="yast2-packager"
MAINTAINER="Ladislav Slezak "
@@ -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-packager $as_me 2.16.28, which was
+This file was extended by yast2-packager $as_me 2.16.29, 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-packager config.status 2.16.28
+yast2-packager config.status 2.16.29
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-packager-2.16.28/configure.in new/yast2-packager-2.16.29/configure.in
--- old/yast2-packager-2.16.28/configure.in 2008-03-26 15:23:24.000000000 +0100
+++ new/yast2-packager-2.16.29/configure.in 2008-03-27 15:36:19.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-packager, 2.16.28, http://bugs.opensuse.org/, yast2-packager)
+AC_INIT(yast2-packager, 2.16.29, http://bugs.opensuse.org/, yast2-packager)
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.16.28"
+VERSION="2.16.29"
RPMNAME="yast2-packager"
MAINTAINER="Ladislav Slezak "
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-packager-2.16.28/src/clients/inst_desktop.ycp new/yast2-packager-2.16.29/src/clients/inst_desktop.ycp
--- old/yast2-packager-2.16.28/src/clients/inst_desktop.ycp 2007-12-10 15:48:06.000000000 +0100
+++ new/yast2-packager-2.16.29/src/clients/inst_desktop.ycp 2008-03-26 16:48:38.000000000 +0100
@@ -4,7 +4,7 @@
* Summary: Desktop Selection
* Authors: Jiri Srain
*
- * $Id: inst_desktop.ycp 42900 2007-12-10 14:48:05Z lslezak $
+ * $Id: inst_desktop.ycp 45758 2008-03-26 15:48:38Z lslezak $
*
*/
@@ -92,7 +92,7 @@
`Top (`Label (kde_blurb)),
`HSpacing (1),
`Right (`Top (`Image (
- Directory::themedir + "/current/icons/48x48/apps/yast-kde.png",
+ Directory::icondir + "/48x48/apps/yast-kde.png",
"")))
))
);
@@ -107,7 +107,7 @@
`Top (`Label (gnome_blurb)),
`HSpacing (1),
`Right (`Top ( `Image (
- Directory::themedir + "/current/icons/48x48/apps/yast-gnome.png",
+ Directory::icondir + "/48x48/apps/yast-gnome.png",
"")))
)
);
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-packager-2.16.28/src/clients/key_manager.ycp new/yast2-packager-2.16.29/src/clients/key_manager.ycp
--- old/yast2-packager-2.16.28/src/clients/key_manager.ycp 2008-01-15 13:44:13.000000000 +0100
+++ new/yast2-packager-2.16.29/src/clients/key_manager.ycp 2008-03-26 16:35:39.000000000 +0100
@@ -64,7 +64,7 @@
symbol Main()
{
Wizard::CreateDialog();
- Wizard::SetDesktopIcon("sw_source");
+ Wizard::SetDesktopIcon("security");
// dialog caption
Wizard::SetContents(_("Initializing..."), `Empty (), "", false, true);
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-packager-2.16.28/src/clients/repositories.ycp new/yast2-packager-2.16.29/src/clients/repositories.ycp
--- old/yast2-packager-2.16.28/src/clients/repositories.ycp 2008-03-26 15:23:16.000000000 +0100
+++ new/yast2-packager-2.16.29/src/clients/repositories.ycp 2008-03-27 15:36:12.000000000 +0100
@@ -7,7 +7,7 @@
* Purpose:
* Adding, removing and prioritizing of repositories for packagemanager.
*
- * $Id: repositories.ycp 45746 2008-03-26 14:23:15Z lslezak $
+ * $Id: repositories.ycp 45798 2008-03-27 14:36:12Z lslezak $
*
*/
@@ -24,6 +24,7 @@
// SourceManager overlaps quite a bit with inst_source,
// so far we only use it for ZMD sync, TODO refactor better
import "SourceManager";
+ import "SourceDialogs";
import "Wizard";
import "Label";
@@ -56,6 +57,9 @@
// constant Plaindir
const string plaindir_type = "Plaindir";
+ // default (minimal) priority of a repository
+ const integer default_priority = 99;
+
boolean download_meta = true;
void RemoveDeletedAddNewRepos () {
@@ -101,6 +105,11 @@
sourceStatesOut = ret;
}
+ string PriorityToString(integer priority)
+ {
+ return (priority == default_priority) ? _("Default") : tostring(priority);
+ }
+
/**
Create a table item from a map as returned by the InstSrcManager agent.
@param source The map describing the source as returned form the agent.
@@ -116,8 +125,11 @@
// unkown name (alias) of the source
generalData[ "alias" ]:generalData[ "type" ]: _("Unknown Name");
+ integer priority = source["priority"]:default_priority;
+
term item = `item(
`id( index ),
+ PriorityToString(priority),
// corresponds to the "Enable/Disable" button
source[ "enabled" ]:true ? UI::Glyph (`CheckMark) : "",
// translators: unknown name for a given source
@@ -137,12 +149,15 @@
// unkown name (alias) of the source
generalData[ "alias" ]:generalData[ "type" ]: _("Unknown Name");
+ // get the editable propertis from 'source' parameter,
+ // get the fixed propertis from the package manager
map out = $[
"enabled" : source["enabled"]:true,
"autorefresh" : source["autorefresh"]:true,
"name" : alias,
"url" : generalData[ "url" ]:"",
"type" : generalData["type"]:"",
+ "priority" : source["priority"]:default_priority,
];
return out;
@@ -173,7 +188,7 @@
string repoInfoRichText(string name, string raw_url, string category)
{
string schema = tolower(URL::Parse(raw_url)["scheme"]:"");
- string icon_tag = " ";
@@ -224,6 +239,7 @@
UI::ChangeWidget (`id (`enable), `Value, info["enabled"]:true);
UI::ChangeWidget (`id (`autorefresh), `Value, info["autorefresh"]:true);
+ UI::ChangeWidget (`id (`priority), `Value, info["priority"]:default_priority);
}
void fillCurrentRepoInfo () {
@@ -264,7 +280,7 @@
}
list new_repos = Pkg::RepositoryScan(url);
- y2internal("new_repos: %1", new_repos);
+ y2milestone("new_repos: %1", new_repos);
// add at least one product if the scan result is empty (no product info available)
if (size(new_repos) == 0)
@@ -493,7 +509,7 @@
}
boolean Write() {
- y2internal("New config: %1", sourceStatesOut);
+ y2milestone("New config: %1", sourceStatesOut);
boolean success = Pkg::SourceEditSet( sourceStatesOut );
// we must sync before the repositories are deleted from zypp
@@ -550,7 +566,6 @@
symbol SummaryDialog () {
y2milestone ("Running Summary dialog");
- list items = [];
// push button - change URL of the selected repository
string replaceButtonLabel = _("&Replace...");
@@ -574,13 +589,16 @@
`VBox(
`HBox(
`Table(`id(`table),`opt(`notify, `immediate),
- // table header
- `header( _("Enabled"),
- // table header
+ `header(
+ // table header - priority of the repository - keep the translation as short as possible!
+ _("Priority"),
+ // table header - is the repo enabled? - keep the translation as short as possible!
+ _("Enabled"),
+ // table header - name of the repo
_("Name"),
- // table header
+ // table header - URL of the repo
_("URL") ),
- items ),
+ [] ),
`HSpacing()
),
`HBox (
@@ -593,9 +611,17 @@
// label
`Left (`Label (_("Properties"))),
// check box
- `Left (`CheckBox (`id (`enable), `opt (`notify), _("&Enabled"))),
- // check box
- `Left (`CheckBox (`id (`autorefresh), `opt (`notify), _("Automatically &Refresh"))),
+ `HBox(
+ `HSquash(
+ `VBox(
+ `Left (`CheckBox (`id (`enable), `opt(`notify), _("&Enabled"))),
+ // check box
+ `Left (`CheckBox (`id (`autorefresh), `opt(`notify), _("Automatically &Refresh")))
+ )
+ ),
+ `HSquash(`IntField(`id(`priority), `opt(`notify), _("&Priority"), 0, 99, default_priority)),
+ `HStretch()
+ ),
`VSpacing (0.4),
(have_rug) ?
`Left (`CheckBox (`id (`zmdsync),
@@ -665,7 +691,7 @@
// help, continued
help_text = help_text + _("<p>
-<b>Modifying a Repository Status</b>
+<b>Modifying a Repository Status</b><br>
To change a repository location, use <b>Edit</b>. To remove a repository, use
<b>Delete</b>. To enable or disable the repository or to change the refresh status at initialization time, select the repository in the table and use the check boxes below.
</p>
@@ -680,6 +706,10 @@
");
}
+ // help text, continued
+ help_text = help_text + _("<P><B>Priority of a Repository</B><BR>
+Priority of a repository is an integer value between 0 (the highest priority) and 99 (the lowest priority). Default priority is 99. If a package is available in more repositories the repository with the highest priority is used.</P>");
+
if (full_mode)
{
Wizard::SetNextButton(`next, Label::OKButton() );
@@ -710,6 +740,8 @@
fillCurrentRepoInfo ();
}
+ current = -1;
+
map event = UI::WaitForEvent();
input = event["ID"]:`nothing;
y2debug( "Input: %1", input );
@@ -933,7 +965,7 @@
state = !state;
// corresponds to the "Enable/Disable" button
string newstate = ( state ? UI::Glyph (`CheckMark) : "");
- UI::ChangeWidget( `id( `table ), `Item( current, 0 ), newstate );
+ UI::ChangeWidget( `id( `table ), `Item( current, 1 ), newstate );
sourceState[ "enabled" ] = state;
sourceStatesOut[ current ] = sourceState;
@@ -961,7 +993,27 @@
}
sourceState["autorefresh"] = state;
sourceStatesOut[ current ] = sourceState;
+
+ // do not refresh the item in the table
+ current = -1;
}
+ else if (input == `priority)
+ {
+ // refresh the value in the table
+ integer new_priority = (integer)UI::QueryWidget(`id(`priority), `Value);
+ y2debug("New priority: %1", new_priority);
+
+ UI::ChangeWidget( `id( `table ), `Item( current, 0 ), PriorityToString(new_priority));
+ sourceState[ "priority" ] = new_priority;
+ sourceStatesOut[ current ] = sourceState;
+
+ // do not refresh the item in the table
+ current = -1;
+ }
+ else
+ {
+ y2warning("Unknown user input: %1", input);
+ }
}
} until ( exit );
@@ -1030,6 +1082,8 @@
symbol TypeDialog()
{
SourceDialogs::SetDownloadOption(true);
+ // reset the stored URL
+ SourceDialogs::SetURL("");
map td = SourceDialogs::TypeDialogDownloadOpt();
symbol ret = td["ui"]:`next;
@@ -1043,6 +1097,22 @@
return ret;
}
+list