Hello community,
here is the log from the commit of package yast2-packager for openSUSE:Factory
checked in at Wed Jul 27 10:04:09 CEST 2011.
--------
--- yast2-packager/yast2-packager.changes 2011-07-25 13:34:00.000000000
+0200
+++ /mounts/work_src_done/STABLE/yast2-packager/yast2-packager.changes
2011-07-26 14:29:56.000000000 +0200
@@ -1,0 +2,7 @@
+Tue Jul 26 12:22:49 UTC 2011 - lsle...@suse.cz
+
+- fixed installation of src.rpm packages from command line
+ (bnc#676505)
+- 2.21.7
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
Old:
----
yast2-packager-2.21.6.tar.bz2
New:
----
yast2-packager-2.21.7.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-packager.spec ++++++
--- /var/tmp/diff_new_pack.qCtA0Q/_old 2011-07-27 09:56:11.000000000 +0200
+++ /var/tmp/diff_new_pack.qCtA0Q/_new 2011-07-27 09:56:11.000000000 +0200
@@ -19,11 +19,11 @@
Name: yast2-packager
-Version: 2.21.6
+Version: 2.21.7
Release: 1
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: yast2-packager-2.21.6.tar.bz2
+Source0: yast2-packager-2.21.7.tar.bz2
Prefix: /usr
@@ -100,7 +100,7 @@
(webpin) and installing them via OneClickInstall
%prep
-%setup -n yast2-packager-2.21.6
+%setup -n yast2-packager-2.21.7
%build
%{prefix}/bin/y2tool y2autoconf
++++++ yast2-packager-2.21.6.tar.bz2 -> yast2-packager-2.21.7.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-packager-2.21.6/VERSION
new/yast2-packager-2.21.7/VERSION
--- old/yast2-packager-2.21.6/VERSION 2011-07-25 13:22:56.000000000 +0200
+++ new/yast2-packager-2.21.7/VERSION 2011-07-26 14:24:21.000000000 +0200
@@ -1 +1 @@
-2.21.6
+2.21.7
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-packager-2.21.6/configure
new/yast2-packager-2.21.7/configure
--- old/yast2-packager-2.21.6/configure 2011-07-25 13:33:35.000000000 +0200
+++ new/yast2-packager-2.21.7/configure 2011-07-26 14:28:21.000000000 +0200
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.68 for yast2-packager 2.21.6.
+# Generated by GNU Autoconf 2.68 for yast2-packager 2.21.7.
#
# 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.21.6'
-PACKAGE_STRING='yast2-packager 2.21.6'
+PACKAGE_VERSION='2.21.7'
+PACKAGE_STRING='yast2-packager 2.21.7'
PACKAGE_BUGREPORT='http://bugs.opensuse.org/'
PACKAGE_URL=''
@@ -1229,7 +1229,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.21.6 to adapt to many kinds of
systems.
+\`configure' configures yast2-packager 2.21.7 to adapt to many kinds of
systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1300,7 +1300,7 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of yast2-packager 2.21.6:";;
+ short | recursive ) echo "Configuration of yast2-packager 2.21.7:";;
esac
cat <<\_ACEOF
@@ -1380,7 +1380,7 @@
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-yast2-packager configure 2.21.6
+yast2-packager configure 2.21.7
generated by GNU Autoconf 2.68
Copyright (C) 2010 Free Software Foundation, Inc.
@@ -1397,7 +1397,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.21.6, which was
+It was created by yast2-packager $as_me 2.21.7, which was
generated by GNU Autoconf 2.68. Invocation command line was
$ $0 $@
@@ -2327,7 +2327,7 @@
# Define the identity of the package.
PACKAGE='yast2-packager'
- VERSION='2.21.6'
+ VERSION='2.21.7'
cat >>confdefs.h <<_ACEOF
@@ -2449,7 +2449,7 @@
-VERSION="2.21.6"
+VERSION="2.21.7"
RPMNAME="yast2-packager"
MAINTAINER="Ladislav Slezak <lsle...@suse.cz>"
@@ -3379,7 +3379,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.21.6, which was
+This file was extended by yast2-packager $as_me 2.21.7, which was
generated by GNU Autoconf 2.68. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -3432,7 +3432,7 @@
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //;
s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
-yast2-packager config.status 2.21.6
+yast2-packager config.status 2.21.7
configured by $0, generated by GNU Autoconf 2.68,
with options \\"\$ac_cs_config\\"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-packager-2.21.6/configure.in
new/yast2-packager-2.21.7/configure.in
--- old/yast2-packager-2.21.6/configure.in 2011-07-25 13:33:33.000000000
+0200
+++ new/yast2-packager-2.21.7/configure.in 2011-07-26 14:28:18.000000000
+0200
@@ -3,7 +3,7 @@
dnl -- This file is generated by y2autoconf 2.18.11 - DO NOT EDIT! --
dnl (edit configure.in.in instead)
-AC_INIT(yast2-packager, 2.21.6, http://bugs.opensuse.org/, yast2-packager)
+AC_INIT(yast2-packager, 2.21.7, 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.21.6"
+VERSION="2.21.7"
RPMNAME="yast2-packager"
MAINTAINER="Ladislav Slezak <lsle...@suse.cz>"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-packager-2.21.6/src/clients/sw_single.ycp
new/yast2-packager-2.21.7/src/clients/sw_single.ycp
--- old/yast2-packager-2.21.6/src/clients/sw_single.ycp 2011-06-24
11:38:35.000000000 +0200
+++ new/yast2-packager-2.21.7/src/clients/sw_single.ycp 2011-07-26
14:28:01.000000000 +0200
@@ -7,7 +7,7 @@
* Purpose: contains dialog loop for workflows:
* "Install/Remove software"
*
- * $Id: sw_single.ycp 64560 2011-06-23 10:08:16Z lslezak $
+ * $Id: sw_single.ycp 65012 2011-07-26 12:28:00Z lslezak $
*
* Note: sw_single accepts a map parameter: $[ "dialog_type" : symbol,
* "repo_mgmt" : boolean ]
@@ -235,8 +235,21 @@
string package_name = out["stdout"]:"";
+ // is it a source package?
+ out = (map)SCR::Execute(.target.bash_output,
+ sformat("/bin/rpm -q --qf '%%{SOURCEPACKAGE}' -p '%1'",
String::Quote(package)));
+ if (out["exit"]:-1 != 0)
+ {
+ // error message
+ Report::Error(sformat(_("Error: Cannot query package
file %1."), package));
+ return `failed;
+ }
+
+ boolean srcpackage = out["stdout"]:"" == "1";
+ y2milestone("File %1: package name: %2, src package: %3",
package, package_name, srcpackage);
+
y2milestone ("Installing %1 from file %2 (repository %3)",
package_name, package, repo_id);
- boolean installed = Pkg::ResolvableInstallRepo(package_name,
`package, repo_id);
+ boolean installed = Pkg::ResolvableInstallRepo(package_name,
srcpackage ? `srcpackage : `package, repo_id);
if (!installed)
{
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
