Hello community,
here is the log from the commit of package yast2-packager
checked in at Tue Apr 4 18:25:13 CEST 2006.
--------
--- yast2-packager/yast2-packager.changes 2006-04-04 15:34:45.000000000 +0200
+++ yast2-packager/yast2-packager.changes 2006-04-04 17:03:56.000000000 +0200
@@ -1,0 +2,7 @@
+Tue Apr 4 17:03:39 CEST 2006 - mvidner@suse.cz
+
+- Call rug sa for all known installation sources,
+ using the URL+alias instead of /installation (#156030).
+- 2.13.58
+
+-------------------------------------------------------------------
Old:
----
yast2-packager-2.13.57.tar.bz2
New:
----
yast2-packager-2.13.58.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-packager.spec ++++++
--- /var/tmp/diff_new_pack.jWdecK/_old 2006-04-04 18:25:03.000000000 +0200
+++ /var/tmp/diff_new_pack.jWdecK/_new 2006-04-04 18:25:03.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package yast2-packager (Version 2.13.57)
+# spec file for package yast2-packager (Version 2.13.58)
#
# Copyright (c) 2006 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.13.57
+Version: 2.13.58
Release: 1
License: GPL
Group: System/YaST
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: yast2-packager-2.13.57.tar.bz2
+Source0: yast2-packager-2.13.58.tar.bz2
prefix: /usr
BuildRequires: docbook-xsl-stylesheets doxygen gcc-c++ libxcrypt-devel libxslt perl-XML-Writer sgml-skel update-desktop-files yast2 yast2-country yast2-devtools yast2-installation yast2-testsuite yast2-xml
Requires: yast2 yast2-installation checkmedia yast2-country
@@ -41,7 +41,7 @@
Arvin Schnell
%prep
-%setup -n yast2-packager-2.13.57
+%setup -n yast2-packager-2.13.58
%build
%{prefix}/bin/y2tool y2autoconf
@@ -78,6 +78,10 @@
%doc %{prefix}/share/doc/packages/yast2-packager
%changelog -n yast2-packager
+* Tue Apr 04 2006 - mvidner@suse.cz
+- Call rug sa for all known installation sources,
+ using the URL+alias instead of /installation (#156030).
+- 2.13.58
* Tue Apr 04 2006 - locilka@suse.cz
- Added initial Signatures-Handling callbacks (#162858)
- 2.13.57
++++++ yast2-packager-2.13.57.tar.bz2 -> yast2-packager-2.13.58.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-packager-2.13.57/VERSION new/yast2-packager-2.13.58/VERSION
--- old/yast2-packager-2.13.57/VERSION 2006-04-04 15:33:47.000000000 +0200
+++ new/yast2-packager-2.13.58/VERSION 2006-04-04 16:33:47.000000000 +0200
@@ -1 +1 @@
-2.13.57
+2.13.58
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-packager-2.13.57/configure new/yast2-packager-2.13.58/configure
--- old/yast2-packager-2.13.57/configure 2006-04-04 15:45:17.000000000 +0200
+++ new/yast2-packager-2.13.58/configure 2006-04-04 16:35:20.000000000 +0200
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.59 for yast2-packager 2.13.57.
+# Generated by GNU Autoconf 2.59 for yast2-packager 2.13.58.
#
# Report bugs to http://www.suse.de/feedback.
#
@@ -269,8 +269,8 @@
# Identity of this package.
PACKAGE_NAME='yast2-packager'
PACKAGE_TARNAME='yast2-packager'
-PACKAGE_VERSION='2.13.57'
-PACKAGE_STRING='yast2-packager 2.13.57'
+PACKAGE_VERSION='2.13.58'
+PACKAGE_STRING='yast2-packager 2.13.58'
PACKAGE_BUGREPORT='http://www.suse.de/feedback'
ac_unique_file="RPMNAME"
@@ -728,7 +728,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.13.57 to adapt to many kinds of systems.
+\`configure' configures yast2-packager 2.13.58 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -795,7 +795,7 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of yast2-packager 2.13.57:";;
+ short | recursive ) echo "Configuration of yast2-packager 2.13.58:";;
esac
cat <<\_ACEOF
@@ -908,7 +908,7 @@
test -n "$ac_init_help" && exit 0
if $ac_init_version; then
cat <<\_ACEOF
-yast2-packager configure 2.13.57
+yast2-packager configure 2.13.58
generated by GNU Autoconf 2.59
Copyright (C) 2003 Free Software Foundation, Inc.
@@ -922,7 +922,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.13.57, which was
+It was created by yast2-packager $as_me 2.13.58, which was
generated by GNU Autoconf 2.59. Invocation command line was
$ $0 $@
@@ -1652,7 +1652,7 @@
# Define the identity of the package.
PACKAGE='yast2-packager'
- VERSION='2.13.57'
+ VERSION='2.13.58'
cat >>confdefs.h <<_ACEOF
@@ -1863,7 +1863,7 @@
-VERSION="2.13.57"
+VERSION="2.13.58"
RPMNAME="yast2-packager"
MAINTAINER="Jiri Srain "
@@ -2695,7 +2695,7 @@
} >&5
cat >&5 <<_CSEOF
-This file was extended by yast2-packager $as_me 2.13.57, which was
+This file was extended by yast2-packager $as_me 2.13.58, which was
generated by GNU Autoconf 2.59. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -2750,7 +2750,7 @@
cat >>$CONFIG_STATUS <<_ACEOF
ac_cs_version="\\
-yast2-packager config.status 2.13.57
+yast2-packager config.status 2.13.58
configured by $0, generated by GNU Autoconf 2.59,
with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\"
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-packager-2.13.57/configure.in new/yast2-packager-2.13.58/configure.in
--- old/yast2-packager-2.13.57/configure.in 2006-04-04 15:45:12.000000000 +0200
+++ new/yast2-packager-2.13.58/configure.in 2006-04-04 16:35:04.000000000 +0200
@@ -1,9 +1,9 @@
dnl configure.in for yast2-packager
dnl
-dnl -- This file is generated by y2autoconf - DO NOT EDIT! --
+dnl -- This file is generated by y2autoconf 2.13.16 - DO NOT EDIT! --
dnl (edit configure.in.in instead)
-AC_INIT(yast2-packager, 2.13.57, http://www.suse.de/feedback, yast2-packager)
+AC_INIT(yast2-packager, 2.13.58, http://www.suse.de/feedback, 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.13.57"
+VERSION="2.13.58"
RPMNAME="yast2-packager"
MAINTAINER="Jiri Srain "
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-packager-2.13.57/src/modules/SourceManager.ycp new/yast2-packager-2.13.58/src/modules/SourceManager.ycp
--- old/yast2-packager-2.13.57/src/modules/SourceManager.ycp 2006-03-29 14:07:44.000000000 +0200
+++ new/yast2-packager-2.13.58/src/modules/SourceManager.ycp 2006-04-04 16:33:15.000000000 +0200
@@ -5,7 +5,7 @@
* Authors: Anas Nashif
* Status: Work in Progress
*
- * $Id: SourceManager.ycp 29499 2006-03-29 09:52:14Z locilka $
+ * $Id: SourceManager.ycp 29665 2006-04-04 14:33:10Z mvidner $
*
* Representation of the configuration of source-manager.
* Input and output routines.
@@ -26,7 +26,7 @@
import "Arch";
import "Mode";
import "Stage";
-
+import "URL";
global list<integer> newSources = [];
@@ -765,10 +765,42 @@
}
}
- /* Adds a ZYPP service into ZMD */
- boolean AddZYPPServiceIntoZMD () {
+ /**
+ * Adds a ZYPP service into ZMD
+ * @param src_id installation source id
+ * @return success
+ */
+ boolean AddZYPPServiceIntoZMD (integer src_id) {
+ map gendata = Pkg::SourceGeneralData (src_id);
+ string url = gendata["url"]:"";
+ // ZMD must have unique URIs, so we append the alias
+ string alias = gendata["alias"]:"";
+ y2milestone ("id: %1, url: %2, alias: %3", src_id, url, alias);
+ if (url == "" || alias == "") {
+ y2error ("ugh");
+ return false;
+ }
+
+ // URL (un)escapes for us
+ // maybe a bug with "="?
+ map parsed_url = URL::Parse (url);
+ string query = parsed_url["query"]:"";
+ if (query != "") query = query + ";";
+ parsed_url["query"] = query + "alias=" + alias;
+ string test_url = URL::Build (parsed_url);
+ y2milestone ("test zmd url: %1", test_url);
+
+ string separator = (search (url, "?") == nil)? "?": ";";
+ url = url + separator + "alias=" + alias;
+ y2milestone ("zmd url: %1", url);
+
+ string name = alias;
+
map ret = RunCommandWithTimeout(
- "TERM=dumb /usr/bin/rug service-add --type=zypp /installation; rug subscribe zypp; exit $?",
+ sformat (
+ "TERM=dumb /usr/bin/rug service-add --type=zypp '%1' '%2' && /usr/bin/rug subscribe '%1'; exit $?",
+ url, name
+ ),
60
);
if (ret != nil && ret["exit"]:nil == 0) {
@@ -851,6 +883,8 @@
}
}
+ // this will not work, /installation is gone
+ if (false) {
// Check whether the ZYPP service is already in zmd db or not
integer count_of_services = CountOfZMDServicesMatching(".*ZYPP.*/installation.*");
if (count_of_services == nil) {
@@ -863,9 +897,15 @@
y2milestone("--- Syncing finished ---");
return true;
}
+ }
// Count of services were 'nil' or '0'
- if (AddZYPPServiceIntoZMD()) {
+ list<integer> src_ids = Pkg::SourceGetCurrent (true /*enabled only?*/);
+ boolean added_ok = true;
+ foreach (integer src_id, src_ids, {
+ added_ok = AddZYPPServiceIntoZMD (src_id) && added_ok;
+ });
+ if (added_ok) {
y2milestone("Adding ZYPP service succeeded");
} else {
Report::Error(Message::CannotWriteSettingsTo("ZMD"));
@@ -882,4 +922,4 @@
// ------------------------------------------------------------------------------------------------------
/* EOF */
-}
\ No newline at end of file
+}
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...