cleanup

yast · Dec 9, 2019 · 0e91d38 · 0e91d38
1 parent 4c45af0
commit 0e91d38
Showing 1 changed file with 2 additions and 14 deletions.
diff --git a/src/clients/vendor.rb b/src/clients/vendor.rb
@@ -128,32 +128,20 @@ def main
 
         @dirlist2 = Convert.to_list(SCR.Read(path(".target.dir"), @cdpath))
         if Ops.less_or_equal(Builtins.size(@dirlist2), 0) ||
-            !(Builtins.contains(@dirlist2, "suse") ||
-              Builtins.contains(@dirlist2, "unitedlinux"))
+            !(Builtins.contains(@dirlist2, "suse"))
           # VENDOR: vendor cd contains wrong data
           return wrong_cd(
             _("Could not find driver data on the CD-ROM.\nAborting now."),
             @is_mounted
           )
         end
 
-        @vendordir = "/suse/"
-
-        if Ops.greater_than(
-            SCR.Read(path(".target.size"), "/etc/UnitedLinux-release"),
-            0
-          )
-          @vendordir = "/UnitedLinux/"
-          version = "ul1"
-        end
-
         @cdpath = Ops.add(
-          Ops.add(Ops.add(Ops.add(@cdpath, @vendordir), Arch.architecture), "-"),
+          Ops.add(Ops.add(Ops.add(@cdpath, "/suse/"), Arch.architecture), "-"),
           version
         )
       end
 
-
       Builtins.y2milestone("Trying %1", @cdpath)
 
       @dirlist = Convert.convert(