Mailinglist Archive: yast-commit (477 mails)

[jsuchome@xxxxxxxxxxxxxxxx]

Author: jsuchome
Date: Fri Jun 26 15:23:26 2009
New Revision: 57773

URL: http://svn.opensuse.org/viewcvs/yast?rev=57773&view=rev
Log:
- manual installation of 32bit packages packages no longer needed
  (bnc#354164) 
- 2.18.1


Modified:
    trunk/samba-client/VERSION
    trunk/samba-client/package/yast2-samba-client.changes
    trunk/samba-client/src/Samba.ycp
    trunk/samba-client/src/complex.ycp
    trunk/samba-client/src/dialogs.ycp

Modified: trunk/samba-client/VERSION
URL: 
http://svn.opensuse.org/viewcvs/yast/trunk/samba-client/VERSION?rev=57773&r1=57772&r2=57773&view=diff
==============================================================================
--- trunk/samba-client/VERSION (original)
+++ trunk/samba-client/VERSION Fri Jun 26 15:23:26 2009
@@ -1 +1 @@
-2.18.0
+2.18.1

Modified: trunk/samba-client/package/yast2-samba-client.changes
URL: 
http://svn.opensuse.org/viewcvs/yast/trunk/samba-client/package/yast2-samba-client.changes?rev=57773&r1=57772&r2=57773&view=diff
==============================================================================
--- trunk/samba-client/package/yast2-samba-client.changes (original)
+++ trunk/samba-client/package/yast2-samba-client.changes Fri Jun 26 15:23:26 
2009
@@ -1,4 +1,11 @@
 -------------------------------------------------------------------
+Fri Jun 26 15:02:54 CEST 2009 - jsuchome@xxxxxxx
+
+- manual installation of 32bit packages packages no longer needed
+  (bnc#354164) 
+- 2.18.1
+
+-------------------------------------------------------------------
 Fri Jun  5 13:52:34 CEST 2009 - jsuchome@xxxxxxx
 
 - fixed architecture dependent packages for PPC (bnc#505263)

Modified: trunk/samba-client/src/Samba.ycp
URL: 
http://svn.opensuse.org/viewcvs/yast/trunk/samba-client/src/Samba.ycp?rev=57773&r1=57772&r2=57773&view=diff
==============================================================================
--- trunk/samba-client/src/Samba.ycp (original)
+++ trunk/samba-client/src/Samba.ycp Fri Jun 26 15:23:26 2009
@@ -15,7 +15,6 @@
 module "Samba";
 textdomain "samba-client";
 
-import "Arch";
 import "Autologin";
 import "FileUtils";
 import "NetworkConfig";
@@ -133,52 +132,9 @@
 // original value of pam_mount_volumes, for detecting changes
 list<map> pam_mount_volumes_orig       = nil;
 
-// packages to install for specific arhitectures (#224418)
-global map arch_packages       = $[
-    "krb5"     : $[
-        "ia64"         : [ "krb5-x86" ],
-        "ppc64"                : [ "krb5-32bit" ],
-        "s390_64"      : [ "krb5-32bit" ],
-        "x86_64"       : [ "krb5-32bit" ],
-    ],
-    "samba-client"     : $[
-        "ia64"         : [ "samba-client-x86" ],
-        "ppc64"                : [ "samba-client-32bit" ],
-        "s390_64"      : [ "samba-client-32bit" ],
-        "x86_64"       : [ "samba-client-32bit" ],
-    ],
-    "samba-winbind"    : $[
-        "ia64"         : [ "samba-winbind-x86" ],
-        "ppc64"                : [ "samba-winbind-32bit" ],
-        "s390_64"      : [ "samba-winbind-32bit" ],
-        "x86_64"       : [ "samba-winbind-32bit" ],
-    ],
-    "pam_mount"                : $[
-       "ia64"          : [ "pam_mount-x86" ],
-       "ppc64"         : [ "pam_mount-32bit" ],
-       "s390_64"       : [ "pam_mount-32bit" ],
-       "x86_64"        : [ "pam_mount-32bit" ],
-    ],
-];
-
 // network configuration (to be read from NetworkConfig module)
 global map network_setup       = NetworkConfig::Export ();
 
-/**
- * Return list of architecture specific packages (derived from package list
- * given as parameter) merged with the packages in parameter
- */
-global define list<string> UpdatedArchPackages (list<string> packages) {
-
-    list<string> ret   = packages;
-    string arch                = Arch::architecture ();
-
-    foreach (string package, packages, {
-        ret    = (list<string>) union (ret, arch_packages[package,arch]:[]);
-    });
-    return ret;
-}
-
 boolean PAMMountModified () {
 
     return
@@ -1138,7 +1094,7 @@
     if (SambaAD::ADS () != "")
        to_install = (list<string>) union (to_install, ["krb5", "krb5-client"]);
     return $[
-       "install"       : UpdatedArchPackages (to_install),
+       "install"       : to_install,
        "remove"        : []
     ];
 }

Modified: trunk/samba-client/src/complex.ycp
URL: 
http://svn.opensuse.org/viewcvs/yast/trunk/samba-client/src/complex.ycp?rev=57773&r1=57772&r2=57773&view=diff
==============================================================================
--- trunk/samba-client/src/complex.ycp (original)
+++ trunk/samba-client/src/complex.ycp Fri Jun 26 15:23:26 2009
@@ -35,8 +35,7 @@
     Wizard::RestoreHelp(HELPS["read"]:"");
 
     // check installed packages
-    if (!PackageSystem::CheckAndInstallPackagesInteractive(
-       Samba::UpdatedArchPackages (["samba-client"])))
+    if (!PackageSystem::CheckAndInstallPackagesInteractive(["samba-client"]))
     {
        y2warning("package samba-client not installed");
         return `abort;

Modified: trunk/samba-client/src/dialogs.ycp
URL: 
http://svn.opensuse.org/viewcvs/yast/trunk/samba-client/src/dialogs.ycp?rev=57773&r1=57772&r2=57773&view=diff
==============================================================================
--- trunk/samba-client/src/dialogs.ycp (original)
+++ trunk/samba-client/src/dialogs.ycp Fri Jun 26 15:23:26 2009
@@ -629,7 +629,6 @@
                {
                    packages = 
(list<string>)merge(packages,["krb5","krb5-client"]);
                }
-               packages        = Samba::UpdatedArchPackages (packages);
                if (!Package::InstallAll (packages))
                {
                    Popup::Error (Message::FailedToInstallPackages ());

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