Author: mvidner Date: Fri May 22 10:54:19 2009 New Revision: 57294 URL: http://svn.opensuse.org/viewcvs/yast?rev=57294&view=rev Log: OOPS, the previous commit (r57293) accidentally included unrelated changes. Reverted. Modified: trunk/yast2/library/cwm/doc/Makefile.am trunk/yast2/library/packages/src/PackageSystem.ycp trunk/yast2/library/runlevel/src/ag_initscripts Modified: trunk/yast2/library/cwm/doc/Makefile.am URL: http://svn.opensuse.org/viewcvs/yast/trunk/yast2/library/cwm/doc/Makefile.am?rev=57294&r1=57293&r2=57294&view=diff ============================================================================== --- trunk/yast2/library/cwm/doc/Makefile.am (original) +++ trunk/yast2/library/cwm/doc/Makefile.am Fri May 22 10:54:19 2009 @@ -1,6 +1,6 @@ # Makefile.am for YCP module .../doc -include ${srcdir}/docbook-xmlto.ami +include ${srcdir}/docbook-docbook-toys.ami SUBDIRS = autodocs @@ -8,7 +8,7 @@ html_DATA = # cwm.html -EXTRA_DIST = $(html_DATA) docbook-*.ami +EXTRA_DIST = $(html_DATA) docbook-docbook-toys.ami DOCBOOK_MAIN = cwm.xml DOCBOOK_FILES = $(wildcard *.xml) Modified: trunk/yast2/library/packages/src/PackageSystem.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/yast2/library/packages/src/PackageSystem.ycp?rev=57294&r1=57293&r2=57294&view=diff ============================================================================== --- trunk/yast2/library/packages/src/PackageSystem.ycp (original) +++ trunk/yast2/library/packages/src/PackageSystem.ycp Fri May 22 10:54:19 2009 @@ -401,8 +401,6 @@ if (SCR::Read (.target.size, "/usr/bin/rpmqpack") > -1) { _rpm_query_binary = "/usr/bin/rpmqpack "; // than rpm itself - } else if (SCR::Read (.target.size, "/usr/bin/dpkg") > -1) { - _rpm_query_binary = "/usr/bin/dpkg -s "; } else if (SCR::Read (.target.size, "/bin/rpm") > -1) { _rpm_query_binary = "/bin/rpm -q "; } @@ -421,7 +419,7 @@ // Unfortunately, initializing Pkg reads the RPM database... // so we must avoid it. // added --whatprovides due to bug #76181 - return 0 == (integer) SCR::Execute(.target.bash, "~/bin/rpm -q " + package); + return 0 == (integer) SCR::Execute(.target.bash, "rpm -q --whatprovides " + package); // return Pkg::IsProvided (package); } Modified: trunk/yast2/library/runlevel/src/ag_initscripts URL: http://svn.opensuse.org/viewcvs/yast/trunk/yast2/library/runlevel/src/ag_initscripts?rev=57294&r1=57293&r2=57294&view=diff ============================================================================== --- trunk/yast2/library/runlevel/src/ag_initscripts (original) +++ trunk/yast2/library/runlevel/src/ag_initscripts Fri May 22 10:54:19 2009 @@ -83,9 +83,6 @@ FILENAME ~ /\.swp$/ || FILENAME ~ /\.core$/ || FILENAME ~ /~$/ || FILENAME ~ /boot\.klog/ || FILENAME ~ /^Makefile/ || -# Fedora - FILENAME == /functions/ || - FILENAME == /killall/ || # why was this here?? # bug 34775: dont skip boot.hotplug-beta, boot.restore_permissions # FILENAME ~ /\.[^0-9$.#_\-\\*]*[0-9$.#_\-\\*]/ -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org