Hello community, here is the log from the commit of package yast2-pkg-bindings for openSUSE:13.1 checked in at 2013-11-06 11:54:57 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:13.1/yast2-pkg-bindings (Old) and /work/SRC/openSUSE:13.1/.yast2-pkg-bindings.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "yast2-pkg-bindings" Changes: -------- --- /work/SRC/openSUSE:13.1/yast2-pkg-bindings/yast2-pkg-bindings.changes 2013-10-08 15:18:59.000000000 +0200 +++ /work/SRC/openSUSE:13.1/.yast2-pkg-bindings.new/yast2-pkg-bindings.changes 2013-11-06 11:54:59.000000000 +0100 @@ -1,0 +2,7 @@ +Tue Nov 5 12:10:30 UTC 2013 - lslezak@suse.cz + +- fixed check for existing repository alias, check the currently + defined repositories not the original ones (bnc#847659) +- 3.0.4 + +------------------------------------------------------------------- Old: ---- yast2-pkg-bindings-3.0.3.tar.bz2 New: ---- yast2-pkg-bindings-3.0.4.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-pkg-bindings-devel-doc.spec ++++++ --- /var/tmp/diff_new_pack.VecZUg/_old 2013-11-06 11:54:59.000000000 +0100 +++ /var/tmp/diff_new_pack.VecZUg/_new 2013-11-06 11:54:59.000000000 +0100 @@ -18,10 +18,10 @@ Name: yast2-pkg-bindings-devel-doc -Version: 3.0.3 +Version: 3.0.4 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: yast2-pkg-bindings-3.0.3.tar.bz2 +Source0: yast2-pkg-bindings-3.0.4.tar.bz2 Prefix: %_prefix # same as in the main package (because we use the same configure.in.in) ++++++ yast2-pkg-bindings.spec ++++++ --- /var/tmp/diff_new_pack.VecZUg/_old 2013-11-06 11:54:59.000000000 +0100 +++ /var/tmp/diff_new_pack.VecZUg/_new 2013-11-06 11:54:59.000000000 +0100 @@ -17,8 +17,8 @@ Name: yast2-pkg-bindings -Version: 3.0.3 -Release: 7 +Version: 3.0.4 +Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build Source0: yast2-pkg-bindings-%{version}.tar.bz2 ++++++ yast2-pkg-bindings-3.0.3.tar.bz2 -> yast2-pkg-bindings-3.0.4.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-pkg-bindings-3.0.3/VERSION new/yast2-pkg-bindings-3.0.4/VERSION --- old/yast2-pkg-bindings-3.0.3/VERSION 2013-09-30 13:17:56.000000000 +0200 +++ new/yast2-pkg-bindings-3.0.4/VERSION 2013-11-05 17:10:15.000000000 +0100 @@ -1 +1 @@ -3.0.3 +3.0.4 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-pkg-bindings-3.0.3/configure new/yast2-pkg-bindings-3.0.4/configure --- old/yast2-pkg-bindings-3.0.3/configure 2013-09-30 13:18:10.000000000 +0200 +++ new/yast2-pkg-bindings-3.0.4/configure 2013-11-05 13:12:08.000000000 +0100 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for yast2-pkg-bindings 3.0.3. +# Generated by GNU Autoconf 2.69 for yast2-pkg-bindings 3.0.4. # # Report bugs to <http://bugs.opensuse.org/>. # @@ -590,8 +590,8 @@ # Identity of this package. PACKAGE_NAME='yast2-pkg-bindings' PACKAGE_TARNAME='yast2-pkg-bindings' -PACKAGE_VERSION='3.0.3' -PACKAGE_STRING='yast2-pkg-bindings 3.0.3' +PACKAGE_VERSION='3.0.4' +PACKAGE_STRING='yast2-pkg-bindings 3.0.4' PACKAGE_BUGREPORT='http://bugs.opensuse.org/' PACKAGE_URL='' @@ -1384,7 +1384,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-pkg-bindings 3.0.3 to adapt to many kinds of systems. +\`configure' configures yast2-pkg-bindings 3.0.4 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1456,7 +1456,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of yast2-pkg-bindings 3.0.3:";; + short | recursive ) echo "Configuration of yast2-pkg-bindings 3.0.4:";; esac cat <<\_ACEOF @@ -1576,7 +1576,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -yast2-pkg-bindings configure 3.0.3 +yast2-pkg-bindings configure 3.0.4 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -2029,7 +2029,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-pkg-bindings $as_me 3.0.3, which was +It was created by yast2-pkg-bindings $as_me 3.0.4, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -2968,7 +2968,7 @@ # Define the identity of the package. PACKAGE='yast2-pkg-bindings' - VERSION='3.0.3' + VERSION='3.0.4' cat >>confdefs.h <<_ACEOF @@ -3091,7 +3091,7 @@ -VERSION="3.0.3" +VERSION="3.0.4" RPMNAME="yast2-pkg-bindings" MAINTAINER="Ladislav Slezák <lslezak@suse.cz>" @@ -16772,7 +16772,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by yast2-pkg-bindings $as_me 3.0.3, which was +This file was extended by yast2-pkg-bindings $as_me 3.0.4, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -16838,7 +16838,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-pkg-bindings config.status 3.0.3 +yast2-pkg-bindings config.status 3.0.4 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-pkg-bindings-3.0.3/configure.ac new/yast2-pkg-bindings-3.0.4/configure.ac --- old/yast2-pkg-bindings-3.0.3/configure.ac 2013-09-30 13:18:05.000000000 +0200 +++ new/yast2-pkg-bindings-3.0.4/configure.ac 2013-11-05 13:12:03.000000000 +0100 @@ -3,7 +3,7 @@ dnl -- This file is generated by y2autoconf 3.0.5 - DO NOT EDIT! -- dnl (edit configure.ac.in or configure.in.in instead) -AC_INIT(yast2-pkg-bindings, 3.0.3, http://bugs.opensuse.org/, yast2-pkg-bindings) +AC_INIT(yast2-pkg-bindings, 3.0.4, http://bugs.opensuse.org/, yast2-pkg-bindings) 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="3.0.3" +VERSION="3.0.4" RPMNAME="yast2-pkg-bindings" MAINTAINER="Ladislav Slezák <lslezak@suse.cz>" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-pkg-bindings-3.0.3/src/Source_Create.cc new/yast2-pkg-bindings-3.0.4/src/Source_Create.cc --- old/yast2-pkg-bindings-3.0.3/src/Source_Create.cc 2013-09-10 09:28:25.000000000 +0200 +++ new/yast2-pkg-bindings-3.0.4/src/Source_Create.cc 2013-11-05 17:10:15.000000000 +0100 @@ -425,14 +425,16 @@ if (check_alias) { - // search in stored repositories - std::list<zypp::RepoInfo> reps = CreateRepoManager()->knownRepositories(); - - if (aliasExists(alias, reps)) - { - y2error("alias %s already exists", alias.c_str()); - return YCPVoid(); - } + // search in stored repositories + for (RepoCont::iterator it = repos.begin(); + it != repos.end(); ++it) + { + if (!(*it)->isDeleted() && (*it)->repoInfo().alias() == alias) + { + y2error("Alias %s already exists, not adding the repo", alias.c_str()); + return YCPVoid(); + } + } } else { -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org