Mailinglist Archive: yast-commit (723 mails)

< Previous Next >
[yast-commit] r47458 - in /trunk/packager: VERSION package/yast2-packager.changes src/clients/pkg_finish.ycp
  • From: jsrain@xxxxxxxxxxxxxxxx
  • Date: Mon, 12 May 2008 14:57:13 -0000
  • Message-id: <20080512145713.946F72EAE3@xxxxxxxxxxxxxxxx>
Author: jsrain
Date: Mon May 12 16:57:13 2008
New Revision: 47458

URL: http://svn.opensuse.org/viewcvs/yast?rev=47458&view=rev
Log:
copy the openSUSE product information from the media to the target system (bnc
#385868)


Modified:
trunk/packager/VERSION
trunk/packager/package/yast2-packager.changes
trunk/packager/src/clients/pkg_finish.ycp

Modified: trunk/packager/VERSION
URL:
http://svn.opensuse.org/viewcvs/yast/trunk/packager/VERSION?rev=47458&r1=47457&r2=47458&view=diff
==============================================================================
--- trunk/packager/VERSION (original)
+++ trunk/packager/VERSION Mon May 12 16:57:13 2008
@@ -1 +1 @@
-2.16.44
+2.16.45

Modified: trunk/packager/package/yast2-packager.changes
URL:
http://svn.opensuse.org/viewcvs/yast/trunk/packager/package/yast2-packager.changes?rev=47458&r1=47457&r2=47458&view=diff
==============================================================================
--- trunk/packager/package/yast2-packager.changes (original)
+++ trunk/packager/package/yast2-packager.changes Mon May 12 16:57:13 2008
@@ -1,4 +1,11 @@
-------------------------------------------------------------------
+Mon May 12 16:43:20 CEST 2008 - jsrain@xxxxxxx
+
+- copy the openSUSE product information from the media to the
+ target system (bnc #385868)
+- 2.16.45
+
+-------------------------------------------------------------------
Fri May 2 17:38:32 CEST 2008 - lslezak@xxxxxxx

- repositories.ycp - do not disable Progress:: when started from

Modified: trunk/packager/src/clients/pkg_finish.ycp
URL:
http://svn.opensuse.org/viewcvs/yast/trunk/packager/src/clients/pkg_finish.ycp?rev=47458&r1=47457&r2=47458&view=diff
==============================================================================
--- trunk/packager/src/clients/pkg_finish.ycp (original)
+++ trunk/packager/src/clients/pkg_finish.ycp Mon May 12 16:57:13 2008
@@ -21,6 +21,7 @@
import "Stage";
import "String";
import "FileUtils";
+import "Packages";

any ret = nil;
string func = "";
@@ -104,6 +105,19 @@
}
else if (func == "Write")
{
+ // Copy information about product (bnc#385868)
+ // FIXME: this is a temporary hack containing a hardcoded file name
+ string media_prod = Pkg::SourceProvideOptionalFile (
+ Packages::theSources[0]:0, 1,
+ "/openSUSE-release.prod");
+ if (media_prod != nil)
+ {
+ WFM::Execute (.local.bash, sformat ("test -d %1%2 || mkdir %1%2",
+ Installation::destdir,
"/etc/zypp/products.d"));
+ WFM::Execute (.local.bash, sformat ("test -d %3%2 && /bin/cp %1 %3%2",
+ media_prod,
"/etc/zypp/products.d", Installation::destdir));
+ }
+
// See bnc #384827, #381360
if (Mode::update()) {
y2milestone ("Adding default repositories");

--
To unsubscribe, e-mail: yast-commit+unsubscribe@xxxxxxxxxxxx
For additional commands, e-mail: yast-commit+help@xxxxxxxxxxxx

< Previous Next >
This Thread
  • No further messages