March 2011 - YaST Commits - openSUSE Mailing Lists

[yast-commit] r63560 - /tags/stable-2_21_0/users/
by jsuchome＠svn2.opensuse.org 10 Mar '11

10 Mar '11

Author: jsuchome Date: Thu Mar 10 16:00:43 2011 New Revision: 63560 URL: http://svn.opensuse.org/viewcvs/yast?rev=63560&view=rev Log: Created tag stable-2_21_0 for users Added: tags/stable-2_21_0/users/ - copied from r63559, trunk/users/ -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r63559 - in /trunk/users: VERSION package/yast2-users.changes src/Users.pm src/UsersRoutines.pm src/dialogs.ycp
by jsuchome＠svn2.opensuse.org 10 Mar '11

10 Mar '11

Author: jsuchome Date: Thu Mar 10 16:00:13 2011 New Revision: 63559 URL: http://svn.opensuse.org/viewcvs/yast?rev=63559&view=rev Log: - added possibility to take old encrypted directory by new user (bnc#425745) - 2.21.0 Modified: trunk/users/VERSION trunk/users/package/yast2-users.changes trunk/users/src/Users.pm trunk/users/src/UsersRoutines.pm trunk/users/src/dialogs.ycp Modified: trunk/users/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/users/VERSION?rev=63559&r1=63558… ============================================================================== --- trunk/users/VERSION (original) +++ trunk/users/VERSION Thu Mar 10 16:00:13 2011 @@ -1 +1 @@ -2.20.2 +2.21.0 Modified: trunk/users/package/yast2-users.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/users/package/yast2-users.change… ============================================================================== --- trunk/users/package/yast2-users.changes (original) +++ trunk/users/package/yast2-users.changes Thu Mar 10 16:00:13 2011 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Thu Mar 10 15:58:17 CET 2011 - jsuchome(a)suse.cz + +- added possibility to take old encrypted directory by new user + (bnc#425745) +- 2.21.0 + +------------------------------------------------------------------- Thu Feb 17 10:59:38 CET 2011 - jsuchome(a)suse.cz - do not run both 'user' and 'user_non_interactive' steps Modified: trunk/users/src/Users.pm URL: http://svn.opensuse.org/viewcvs/yast/trunk/users/src/Users.pm?rev=63559&r1=… ============================================================================== --- trunk/users/src/Users.pm (original) +++ trunk/users/src/Users.pm Thu Mar 10 16:00:13 2011 @@ -3445,7 +3445,8 @@ return 0 if ($home_size == 0 && $org_size == 0); # nothing to do return 0 if (!defined $pw && !defined $new_pw); # no change without password provided :-( - return 0 if ($home eq $org_home && $username eq $org_username && $home_size == $org_size && $pw eq $new_pw); + return 0 if ($home eq $org_home && $username eq $org_username && $home_size == $org_size && + (($pw || "") eq ($new_pw || ""))); return 1; } Modified: trunk/users/src/UsersRoutines.pm URL: http://svn.opensuse.org/viewcvs/yast/trunk/users/src/UsersRoutines.pm?rev=6… ============================================================================== --- trunk/users/src/UsersRoutines.pm (original) +++ trunk/users/src/UsersRoutines.pm Thu Mar 10 16:00:13 2011 @@ -16,6 +16,7 @@ ##------------------------------------ ##------------------- global imports +YaST::YCP::Import ("FileUtils"); YaST::YCP::Import ("Pam"); YaST::YCP::Import ("Report"); YaST::YCP::Import ("SCR"); @@ -32,6 +33,12 @@ # 'volume' information from pam_mount (info about crypted homes) my $pam_mount = undef; +# owners of img files +my $img2user = undef; + +# owners of key files +my $key2user = undef; + # could we use pam_mount? currntly not if fingerprint dev is in use (bnc#390810) my $crypted_homes_enabled = undef; @@ -335,7 +342,7 @@ { SCR->Write (".target.string", $pw_path, $pw); my $command = "$cryptconfig open --key-file=$org_key $org_img < $pw_path"; - y2debug ("cmd: $command"); + y2milestone ("cmd: $command"); my $out = SCR->Execute (".target.bash_output", $command); SCR->Execute (".target.remove", $pw_path); if ($out->{"exit"} ne 0) { @@ -354,7 +361,7 @@ SCR->Execute (".target.bash", "/bin/rm -rf $mnt_dir") if (FileUtils->Exists ($mnt_dir)); SCR->Execute (".target.mkdir", $mnt_dir); $command = "mount -o loop $image_path $mnt_dir"; - y2debug ("cmd: $command"); + y2milestone ("cmd: $command"); $out = SCR->Execute (".target.bash_output", $command); if ($out->{"exit"} ne 0 && $out->{"stderr"}) { y2error ("error calling $command: ", $out->{"stderr"}); @@ -363,21 +370,21 @@ } # copy the directory content to tmp home $command = "/bin/cp -ar $mnt_dir $tmpdir/$username"; - y2debug ("cmd: $command"); + y2milestone ("cmd: $command"); $out = SCR->Execute (".target.bash_output", $command); if ($out->{"exit"} ne 0 && $out->{"stderr"}) { y2error ("error calling $command: ", $out->{"stderr"}); return 0; } $command = "umount $mnt_dir"; - y2debug ("cmd: $command"); + y2milestone ("cmd: $command"); $out = SCR->Execute (".target.bash_output", $command); if ($out->{"exit"} ne 0 && $out->{"stderr"}) { y2error ("error calling $command: ", $out->{"stderr"}); return 0; } $command = "$cryptconfig pm-disable $username"; - y2debug ("cmd: $command"); + y2milestone ("cmd: $command"); $out = SCR->Execute (".target.bash_output", $command); if ($out->{"exit"} ne 0 && $out->{"stderr"}) { y2error ("error calling $command: ", $out->{"stderr"}); @@ -385,7 +392,7 @@ return 0; } $command = "$cryptconfig close $org_img"; - y2debug ("cmd: $command"); + y2milestone ("cmd: $command"); $out = SCR->Execute (".target.bash_output", $command); if ($out->{"exit"} ne 0 && $out->{"stderr"}) { y2error ("error calling $command: ", $out->{"stderr"}); @@ -402,7 +409,6 @@ SCR->Execute (".target.bash", "/bin/rm -rf $org_key"); return 1; } - # check user renaming or directory move if ($home ne $org_home || $org_username ne $username) { if (FileUtils->Exists ($org_img)) { @@ -428,22 +434,27 @@ } } } - SCR->Write (".target.string", $pw_path, $pw); + if (defined $user->{"take_existing_image"}) { + $image_file = "$home.img" if FileUtils->Exists ("$home.img"); + $key_file = "$home.key" if FileUtils->Exists ("$home.key"); + y2milestone ("going to yake image $image_file by user $username"); + } if (defined $key_file || defined $image_file) { $cmd = "$cryptconfig pm-enable --replace "; $cmd = $cmd."--key-file=$key_file " if defined $key_file; $cmd = $cmd."--image-file=$image_file " if defined $image_file; $cmd = $cmd."$username"; - y2debug ("cmd: $cmd"); + y2milestone ("cmd: $cmd"); my $out = SCR->Execute (".target.bash_output", $cmd); if ($out->{"exit"} ne 0 && $out->{"stderr"}) { Report->Error ($out->{"stderr"}); - SCR->Execute (".target.remove", $pw_path); return 0; } } + SCR->Write (".target.string", $pw_path, $pw); + # now check if existing image doesn't need resizing $key_file = $org_key if (!defined $key_file && FileUtils->Exists ($org_key)); $image_file = $org_img if (!defined $image_file && FileUtils->Exists ($org_img)); @@ -452,7 +463,7 @@ if ($modified eq "edited" && defined $key_file && defined $new_pw && $new_pw ne $pw) { SCR->Write (".target.string", $pw_path, "$pw\n$new_pw"); my $command = "$cryptconfig passwd --no-verify $key_file < $pw_path"; - y2debug ("cmd: $command"); + y2milestone ("cmd: $command"); my $out = SCR->Execute (".target.bash_output", $command); if ($out->{"exit"} ne 0) { y2error ("error calling $command"); @@ -478,12 +489,12 @@ } # ok, only password change was needed else { - y2debug ("nothing to do"); + y2milestone ("nothing to do"); SCR->Execute (".target.remove", $pw_path); return 1; } - y2debug ("cmd: $cmd"); + y2milestone ("cmd: $cmd"); my $out = SCR->Execute (".target.bash_output", $cmd); if ($out->{"exit"} ne 0 && $out->{"stderr"}) { Report->Error ($out->{"stderr"}); @@ -528,6 +539,10 @@ my $username = $usermap->{"user"}; next if !defined $username; $pam_mount->{$username} = $usermap; + my $img = $usermap->{"path"} || ""; + $img2user->{$img} = $username if $img; + my $key = $usermap->{"fskeypath"} || ""; + $key2user->{$key} = $username if $key; } } } @@ -541,6 +556,38 @@ } ##------------------------------------ +# Return the owner of given crypted directory image +# @param image name +# @return string +BEGIN { $TYPEINFO{CryptedImageOwner} = ["function", "string", "string"];} +sub CryptedImageOwner { + + my $self = shift; + my $img_file= shift; + + if ($self->ReadCryptedHomesInfo ()) { + return $img2user->{$img_file} || ""; + } + return ""; +} + +##------------------------------------ +# Return the owner of given crypted directory key +# @param key name +# @return string +BEGIN { $TYPEINFO{CryptedKeyOwner} = ["function", "string", "string"];} +sub CryptedKeyOwner { + + my $self = shift; + my $key_file= shift; + + if ($self->ReadCryptedHomesInfo ()) { + return $key2user->{$key_file} || ""; + } + return ""; +} + +##------------------------------------ # Return the path to user's crypted directory image; returns empty string if there is none defined # @param user name # @return string Modified: trunk/users/src/dialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/users/src/dialogs.ycp?rev=63559&… ============================================================================== --- trunk/users/src/dialogs.ycp (original) +++ trunk/users/src/dialogs.ycp Thu Mar 10 16:00:13 2011 @@ -309,6 +309,20 @@ } /** + * helper function: show a popup if existing crypted home directory file + * should be used by current user + */ + boolean ask_take_image (string img_file, string key_file) { + + // yes/no popup label, %1,%2 are file paths + return Popup::YesNo (sformat (_("Crypted directory image and key files +'%1' and '%2' +were found. Use them for current user? + +This means that data from this image will be used instead of current home directory."), img_file, key_file)); + } + + /** * helper function: show a popup if existing home directory should be used * and its ownership should be changed */ @@ -324,7 +338,7 @@ `CheckBox (`id(`chown_home), _("&Change directory owner"), chown_default) ), - `HBox( + `ButtonBox( `PushButton (`id(`yes), `opt(`default), Label::YesButton()), `PushButton (`id(`no), Label::NoButton()) ), @@ -1736,8 +1750,26 @@ ) ) { + string img_file = sformat ("%1.img", home); + string key_file = sformat ("%1.key", home); + // ask to take existing orphaned image by user + // without current directory encrypted (bnc#425745) + if (org_crypted_home_size == 0 && + FileUtils::Exists (img_file) && FileUtils::Exists (key_file) && + UsersRoutines::CryptedImageOwner (img_file) == "" && + UsersRoutines::CryptedImageOwner (key_file) == "" && + ask_take_image (img_file, key_file) + ) + { + user["take_existing_image"] = img_file; + } + + // do not ask when enabling for first time and password was already entered - if ((user["encrypted"]:false == false || user["text_userpassword"]:nil != nil) && + // do not ask when taking existing image, pw not needed for that FIXME really? + if ((user["encrypted"]:false == false || + user["text_userpassword"]:nil != nil || + user["take_existing_image"]:"" != "") && org_crypted_home_size == 0) { user["current_text_userpassword"] = (user["text_userpassword"]:nil != nil) ? -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r63558 - /trunk/system-update/
by jsrain＠svn2.opensuse.org 10 Mar '11

10 Mar '11

Author: jsrain Date: Thu Mar 10 13:13:52 2011 New Revision: 63558 URL: http://svn.opensuse.org/viewcvs/yast?rev=63558&view=rev Log: removed failed experiment Removed: trunk/system-update/ -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r63557 - /trunk/ntsutils/
by jsrain＠svn2.opensuse.org 10 Mar '11

10 Mar '11

Author: jsrain Date: Thu Mar 10 13:13:24 2011 New Revision: 63557 URL: http://svn.opensuse.org/viewcvs/yast?rev=63557&view=rev Log: removed module which never made it to the distro and has not been touched for years Removed: trunk/ntsutils/ -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r63556 - in /trunk/storage/storage/src/include: ep-btrfs-dialogs.ycp ep-btrfs-lib.ycp ep-btrfs.ycp
by fehr＠svn2.opensuse.org 10 Mar '11

10 Mar '11

Author: fehr Date: Thu Mar 10 11:09:40 2011 New Revision: 63556 URL: http://svn.opensuse.org/viewcvs/yast?rev=63556&view=rev Log: add files for handling btrfs panel Added: trunk/storage/storage/src/include/ep-btrfs-dialogs.ycp trunk/storage/storage/src/include/ep-btrfs-lib.ycp trunk/storage/storage/src/include/ep-btrfs.ycp Added: trunk/storage/storage/src/include/ep-btrfs-dialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/include/ep-b… ============================================================================== --- trunk/storage/storage/src/include/ep-btrfs-dialogs.ycp (added) +++ trunk/storage/storage/src/include/ep-btrfs-dialogs.ycp Thu Mar 10 11:09:40 2011 @@ -0,0 +1,36 @@ +/** + * File: ep-btrfs-dialogs.ycp + * Package: yast2-storage + * Summary: Expert Partitioner + * Authors: Thomas Fehr <fehr(a)suse.de> + * + * This file must only be included in other Expert Partitioner files ("ep-*.ycp"). + */ +{ + textdomain "storage"; + + + boolean DlgEditBtrfsVolume(map<string, any> &data) + { + y2milestone( "DlgEditBtrfsVolume %1", data ); + string device = data["device"]:"error"; + + map<string, any> aliases = $[ + "FormatMount" : ``(MiniWorkflowStepFormatMount(data)), + "Password" : ``(MiniWorkflowStepPassword(data)) + ]; + + map<string, any> sequence = $[ + "FormatMount" : $[ `next : "Password", + `finish : `finish ], + "Password" : $[ `finish : `finish ] + ]; + + // dialog title + string title = sformat(_("Edit Btrfs %1"), data["uuid"]:""); + + symbol widget = MiniWorkflow::Run(title, StorageIcons::lvm_lv_icon, aliases, sequence, "FormatMount"); + + return widget == `finish; + } +} Added: trunk/storage/storage/src/include/ep-btrfs-lib.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/include/ep-b… ============================================================================== --- trunk/storage/storage/src/include/ep-btrfs-lib.ycp (added) +++ trunk/storage/storage/src/include/ep-btrfs-lib.ycp Thu Mar 10 11:09:40 2011 @@ -0,0 +1,97 @@ +/** + * File: ep-btrfs-lib.ycp + * Package: yast2-storage + * Summary: Expert Partitioner + * Authors: Thomas Fehr <fehr(a)suse.de> + * + * This file must only be included in other Expert Partitioner files ("ep-*.ycp"). + */ +{ + textdomain "storage"; + + + void EpEditBtrfsDevice(string device) + { + if (device == nil) + { + // error popup + Popup::Error(_("No BTRFS device selected.")); + return; + } + + map<string, map> target_map = Storage::GetTargetMap(); + map<string, any> data = Storage::GetPartition(target_map, device); + y2milestone( "EpEditBtrfsDevice device:%1 data:%2", device, data ); + + if (Storage::IsUsedBy(data)) + { + // error popup + Popup::Error(sformat(_("The Btrfs %1 is in use. It cannot be +edited. To edit %1, make sure it is not used."), data["uuid"]:"")); + return; + } + + if (DlgEditBtrfsVolume(data)) + { + Storage::ChangeVolumeProperties(data); + + UpdateMainStatus(); + UpdateNavigationTree(nil); + TreePanel::Create(); + UpdateTableFocus(device); + } + } + + void EpDeleteBtrfsDevice(string device) + { + if (device == nil) + { + // error popup + Popup::Error(_("No BTRFS device selected.")); + return; + } + + map<string, map> target_map = Storage::GetTargetMap(); + map<string, any> data = Storage::GetPartition(target_map, device); + y2milestone( "EpDeletBtrfsDevice device:%1 data:%2", device, data ); + + if (!Storage::CanDelete(data, target_map["/dev/btrfs"]:$[], true)) + return; + + if (EpDeleteDevice(device)) + { + any new_focus = nil; + if (UI::QueryWidget(`tree, `CurrentItem) == device) + new_focus = `md; + UpdateMainStatus(); + UpdateNavigationTree(new_focus); + TreePanel::Create(); + } + + } + + void EpResizeBtrfsDevice(string device) + { + if (device == nil) + { + // error popup + Popup::Error(_("No BTRFS device selected.")); + return; + } + + map<string, map> target_map = Storage::GetTargetMap(); + map<string, any> data = Storage::GetPartition(target_map, device); + y2milestone( "EpResizetrfsDevice device:%1 data:%2", device, data ); + + if (true/*EpDeleteDevice(device)*/) + { + any new_focus = nil; + if (UI::QueryWidget(`tree, `CurrentItem) == device) + new_focus = `btrfs; + UpdateMainStatus(); + UpdateNavigationTree(new_focus); + TreePanel::Create(); + } + + } +} Added: trunk/storage/storage/src/include/ep-btrfs.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/include/ep-b… ============================================================================== --- trunk/storage/storage/src/include/ep-btrfs.ycp (added) +++ trunk/storage/storage/src/include/ep-btrfs.ycp Thu Mar 10 11:09:40 2011 @@ -0,0 +1,229 @@ +/** + * File: ep-btrfs.ycp + * Package: yast2-storage + * Summary: Expert Partitioner + * Authors: Thomas Fehr <fehr(a)suse.de> + * + * This file must only be included in other Expert Partitioner files ("ep-*.ycp"). + */ +{ + textdomain "storage"; + + include "partitioning/ep-btrfs-dialogs.ycp"; + include "partitioning/ep-btrfs-lib.ycp"; + + + void EpContextMenuBtrfs(string device) + { + symbol widget = ContextMenu::Simple([ `item(`id(`edit), _("Edit")), + `item(`id(`delete), _("Delete"))]); + + switch (widget) + { + case `edit: + EpEditBtrfsDevice(device); + break; + case `delete: + EpDeleteBtrfsDevice(device); + break; + } + } + + void HandleBtrfsButtons( any user_data, string device, map event ) + { + y2milestone( "HandleBtrfsButtons device:%1 user_data:%2 event:%3", + device, event, user_data ); + string disk_device = ""; + + if (user_data == nil) + { + map disk = nil; + map part = nil; + + map<string, map> target_map = Storage::GetTargetMap(); + SplitDevice(target_map, device, disk, part); + disk_device = (string) disk["device"]:""; + } + else + { + disk_device = (string) user_data; + } + + switch (Event::IsWidgetActivated(event)) + { + case `edit: + EpEditBtrfsDevice(device); + break; + + case `resize: + EpResizeBtrfsDevice(device); + break; + } + } + + void CreateBtrfsMainPanel(any user_data) + { + list<symbol> fields = StorageSettings::FilterTable([ `device, `size, `format, `encrypted, `type, + `fs_type, `label, `mount_point, `mount_by ]); + + map<string, map> target_map = Storage::GetTargetMap(); + term table_header = StorageFields::TableHeader(fields); + list<term> table_contents = StorageFields::TableContents(fields, target_map, StorageFields::PredicateBtrfs); + UI::ReplaceWidget(`tree_panel, + Greasemonkey::Transform( + `VBox( + `HStretch(), + // heading + `IconAndHeading(_("Btrfs Volumes (BTRFS)"), StorageIcons::dm_icon ), + `Table(`id(`table), `opt(`keepSorting, `notify, `notifyContextMenu), + table_header, table_contents), + ArrangeButtons([ // push button text + `PushButton(`id(`edit),`opt(`key_F4), _("Edit...")), + // push button text + `PushButton(`id(`resize),`opt(`key_F8), _("Resize...")), + `HStretch() ]) + ) + )); + + // helptext + string helptext = _("This view shows all BTRFS volumes."); + + Wizard::RestoreHelp(helptext + StorageFields::TableHelptext(fields)); + } + + void HandleBtrfsMainPanel(any user_data, map event) + { + string device = (string) UI::QueryWidget(`id(`table), `CurrentItem); + HandleBtrfsButtons( user_data, device, event ); + switch (Event::IsWidgetContextMenuActivated(event)) + { + case `table: + EpContextMenuDevice(device); + break; + } + UI::SetFocus(`id(`table)); + } + + + void CreateBtrfsOverviewTab(any user_data) + { + string device = (string) user_data; + y2milestone( "CreateBtrfsOverviewTab user_data:%1", user_data ); + + map<string, map> target_map = Storage::GetTargetMap(); + + list<symbol> fields = StorageSettings::FilterOverview([ `heading_device, `device, `size, `used_by, + `heading_filesystem, `fs_type, `mount_point, + `mount_by, `uuid, `label ]); + + UI::ReplaceWidget(`tab_panel, + Greasemonkey::Transform( + `VBox( + StorageFields::Overview(fields, target_map, device), + `HBox( + // push button text + `PushButton(`id(`edit), _("Edit...")), + `HStretch() + ) + ) + ) + ); + + // helptext + string helptext = _("This view shows detailed information about the +selected BTRFS volume."); + + Wizard::RestoreHelp(helptext + StorageFields::OverviewHelptext(fields)); + } + + + void HandleBtrfsOverviewTab(any user_data, map event) + { + string device = (string) user_data; + y2milestone( "HandleBtrfsOverviewTab user_data:%1", user_data ); + + switch (Event::IsWidgetActivated(event)) + { + case `edit: + EpEditBtrfsDevice(device); + break; + case `delete: + EpDeleteBtrfsDevice(device); + break; + case `resize: + EpResizeBtrfsDevice(device); + break; + } + } + + + void CreateBtrfsDevicesTab(any user_data) + { + string part_device = (string) user_data; + integer pos = search( part_device, "=" ); + if( pos != nil ) + part_device = substring( part_device, pos+1 ); + y2milestone( "CreateBtrfsDevicesTab user_data:%1 part_device:%2", user_data, part_device ); + + symbol Predicate(map disk, map partition) + { + return StorageFields::PredicateUsedByDevice(disk, partition, [ part_device ]); + } + + list<symbol> fields = StorageSettings::FilterTable([ `device, `udev_path, `udev_id, `size, + `format, `encrypted, `type ]); + + map<string, map> target_map = Storage::GetTargetMap(); + + term table_header = StorageFields::TableHeader(fields); + list<term> table_contents = StorageFields::TableContents(fields, target_map, Predicate); + + UI::ReplaceWidget(`tab_panel, + `VBox( + `Table(`id(`table), `opt(`keepSorting, `notify), + table_header, table_contents) + ) + ); + + // helptext + string helptext = _("This view shows all devices used by the +selected BTRFS volume."); + + Wizard::RestoreHelp(helptext + StorageFields::TableHelptext(fields)); + } + + + void CreateBtrfsPanel(any user_data) + { + string device = (string) user_data; + y2milestone( "CreateBtrfsPanel user_data:%1 device:%2", user_data, device ); + + map<symbol, map> data = $[ `overview : $[ `create : CreateBtrfsOverviewTab, `handle : HandleBtrfsOverviewTab, `user_data : user_data ], + `devices : $[ `create : CreateBtrfsDevicesTab, `user_data : user_data ] ]; + + UI::ReplaceWidget(`tree_panel, + Greasemonkey::Transform( + `VBox( + // heading + `IconAndHeading(sformat(_("Btrfs Device: %1"), device), StorageIcons::lvm_lv_icon), + `DumbTab(`id(`tab), [ + // push button text + `item(`id(`overview), _("&Overview")), + // push button text + `item(`id(`devices), _("&Used Devices")) + ], + `ReplacePoint(`id(`tab_panel), TabPanel::empty_panel) + ) + ) + ) + ); + + TabPanel::Init(data, `overview); + } + + + void HandleBtrfsPanel(any user_data, map event) + { + TabPanel::Handle(event); + } +} -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r63555 - /trunk/storage/storage/src/modules/Storage.ycp
by fehr＠svn2.opensuse.org 09 Mar '11

09 Mar '11

Author: fehr Date: Wed Mar 9 18:29:55 2011 New Revision: 63555 URL: http://svn.opensuse.org/viewcvs/yast?rev=63555&view=rev Log: add uuid to single volume btrfs entry Modified: trunk/storage/storage/src/modules/Storage.ycp Modified: trunk/storage/storage/src/modules/Storage.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/modules/Stor… ============================================================================== --- trunk/storage/storage/src/modules/Storage.ycp (original) +++ trunk/storage/storage/src/modules/Storage.ycp Wed Mar 9 18:29:55 2011 @@ -1780,6 +1780,7 @@ foreach( map p, simple, { tg = SetPartitionData( tg, p["device"]:"", "subvol", p["subvol"]:[] ); + tg = SetPartitionData( tg, p["device"]:"", "uuid", p["uuid"]:"" ); }); } return( tg ); -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r63554 - /trunk/packager/yast2-packager.spec.in
by lslezak＠svn2.opensuse.org 09 Mar '11

09 Mar '11

Author: lslezak Date: Wed Mar 9 16:06:44 2011 New Revision: 63554 URL: http://svn.opensuse.org/viewcvs/yast?rev=63554&view=rev Log: webpin package - fixed group name Modified: trunk/packager/yast2-packager.spec.in Modified: trunk/packager/yast2-packager.spec.in URL: http://svn.opensuse.org/viewcvs/yast/trunk/packager/yast2-packager.spec.in?… ============================================================================== --- trunk/packager/yast2-packager.spec.in (original) +++ trunk/packager/yast2-packager.spec.in Wed Mar 9 16:06:44 2011 @@ -62,7 +62,7 @@ %package webpin -Group: System/YaST2 +Group: System/YaST Summary: YaST2 - Webpin package search client %description -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r63553 - /tags/stable-2_21_0/tv/
by lslezak＠svn2.opensuse.org 09 Mar '11

09 Mar '11

Author: lslezak Date: Wed Mar 9 15:41:55 2011 New Revision: 63553 URL: http://svn.opensuse.org/viewcvs/yast?rev=63553&view=rev Log: Created tag stable-2_21_0 for tv Added: tags/stable-2_21_0/tv/ - copied from r63552, trunk/tv/ -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r63552 - in /trunk/tv: ./ data/ package/
by lslezak＠svn2.opensuse.org 09 Mar '11

09 Mar '11

Author: lslezak Date: Wed Mar 9 15:41:41 2011 New Revision: 63552 URL: http://svn.opensuse.org/viewcvs/yast?rev=63552&view=rev Log: - updated TV card database - 2.21.0 Added: trunk/tv/data/CARDLIST.au0828 trunk/tv/data/CARDLIST.saa7164 Modified: trunk/tv/VERSION trunk/tv/data/CARDLIST.bttv trunk/tv/data/CARDLIST.cx23885 trunk/tv/data/CARDLIST.cx88 trunk/tv/data/CARDLIST.em28xx trunk/tv/data/CARDLIST.saa7134 trunk/tv/data/CARDLIST.tuner trunk/tv/data/Makefile.am trunk/tv/data/create_tuner_db trunk/tv/data/create_tv_db trunk/tv/package/yast2-tv.changes Modified: trunk/tv/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/tv/VERSION?rev=63552&r1=63551&r2… ============================================================================== --- trunk/tv/VERSION (original) +++ trunk/tv/VERSION Wed Mar 9 15:41:41 2011 @@ -1 +1 @@ -2.19.3 +2.21.0 Added: trunk/tv/data/CARDLIST.au0828 URL: http://svn.opensuse.org/viewcvs/yast/trunk/tv/data/CARDLIST.au0828?rev=6355… ============================================================================== --- trunk/tv/data/CARDLIST.au0828 (added) +++ trunk/tv/data/CARDLIST.au0828 Wed Mar 9 15:41:41 2011 @@ -0,0 +1,6 @@ + 0 -> Unknown board (au0828) + 1 -> Hauppauge HVR950Q (au0828) [2040:7200,2040:7210,2040:7217,2040:721b,2040:721e,2040:721f,2040:7280,0fd9:0008] + 2 -> Hauppauge HVR850 (au0828) [2040:7240] + 3 -> DViCO FusionHDTV USB (au0828) [0fe9:d620] + 4 -> Hauppauge HVR950Q rev xxF8 (au0828) [2040:7201,2040:7211,2040:7281] + 5 -> Hauppauge Woodbury (au0828) [2040:8200] Modified: trunk/tv/data/CARDLIST.bttv URL: http://svn.opensuse.org/viewcvs/yast/trunk/tv/data/CARDLIST.bttv?rev=63552&… ============================================================================== --- trunk/tv/data/CARDLIST.bttv (original) +++ trunk/tv/data/CARDLIST.bttv Wed Mar 9 15:41:41 2011 @@ -100,7 +100,7 @@ 99 -> AD-TVK503 100 -> Hercules Smart TV Stereo 101 -> Pace TV & Radio Card -102 -> IVC-200 [0000:a155,0001:a155,0002:a155,0003:a155,0100:a155,0101:a155,0102:a155,0103:a155] +102 -> IVC-200 [0000:a155,0001:a155,0002:a155,0003:a155,0100:a155,0101:a155,0102:a155,0103:a155,0800:a155,0801:a155,0802:a155,0803:a155] 103 -> Grand X-Guard / Trust 814PCI [0304:0102] 104 -> Nebula Electronics DigiTV [0071:0101] 105 -> ProVideo PV143 [aa00:1430,aa00:1431,aa00:1432,aa00:1433,aa03:1433] Modified: trunk/tv/data/CARDLIST.cx23885 URL: http://svn.opensuse.org/viewcvs/yast/trunk/tv/data/CARDLIST.cx23885?rev=635… ============================================================================== --- trunk/tv/data/CARDLIST.cx23885 (original) +++ trunk/tv/data/CARDLIST.cx23885 Wed Mar 9 15:41:41 2011 @@ -17,7 +17,13 @@ 16 -> DVBWorld DVB-S2 2005 [0001:2005] 17 -> NetUP Dual DVB-S2 CI [1b55:2a2c] 18 -> Hauppauge WinTV-HVR1270 [0070:2211] - 19 -> Hauppauge WinTV-HVR1275 [0070:2215] - 20 -> Hauppauge WinTV-HVR1255 [0070:2251] - 21 -> Hauppauge WinTV-HVR1210 [0070:2291,0070:2295] + 19 -> Hauppauge WinTV-HVR1275 [0070:2215,0070:221d,0070:22f2] + 20 -> Hauppauge WinTV-HVR1255 [0070:2251,0070:2259,0070:22f1] + 21 -> Hauppauge WinTV-HVR1210 [0070:2291,0070:2295,0070:2299,0070:229d,0070:22f0,0070:22f3,0070:22f4,0070:22f5] 22 -> Mygica X8506 DMB-TH [14f1:8651] + 23 -> Magic-Pro ProHDTV Extreme 2 [14f1:8657] + 24 -> Hauppauge WinTV-HVR1850 [0070:8541] + 25 -> Compro VideoMate E800 [1858:e800] + 26 -> Hauppauge WinTV-HVR1290 [0070:8551] + 27 -> Mygica X8558 PRO DMB-TH [14f1:8578] + 28 -> LEADTEK WinFast PxTV1200 [107d:6f22] Modified: trunk/tv/data/CARDLIST.cx88 URL: http://svn.opensuse.org/viewcvs/yast/trunk/tv/data/CARDLIST.cx88?rev=63552&… ============================================================================== --- trunk/tv/data/CARDLIST.cx88 (original) +++ trunk/tv/data/CARDLIST.cx88 Wed Mar 9 15:41:41 2011 @@ -80,3 +80,7 @@ 79 -> Terratec Cinergy HT PCI MKII [153b:1177] 80 -> Hauppauge WinTV-IR Only [0070:9290] 81 -> Leadtek WinFast DTV1800 Hybrid [107d:6654] + 82 -> WinFast DTV2000 H rev. J [107d:6f2b] + 83 -> Prof 7301 DVB-S/S2 [b034:3034] + 84 -> Samsung SMT 7020 DVB-S [18ac:dc00,18ac:dccd] + 85 -> Twinhan VP-1027 DVB-S [1822:0023] Modified: trunk/tv/data/CARDLIST.em28xx URL: http://svn.opensuse.org/viewcvs/yast/trunk/tv/data/CARDLIST.em28xx?rev=6355… ============================================================================== --- trunk/tv/data/CARDLIST.em28xx (original) +++ trunk/tv/data/CARDLIST.em28xx Wed Mar 9 15:41:41 2011 @@ -1,5 +1,5 @@ 0 -> Unknown EM2800 video grabber (em2800) [eb1a:2800] - 1 -> Unknown EM2750/28xx video grabber (em2820/em2840) [eb1a:2710,eb1a:2820,eb1a:2821,eb1a:2860,eb1a:2861,eb1a:2870,eb1a:2881,eb1a:2883] + 1 -> Unknown EM2750/28xx video grabber (em2820/em2840) [eb1a:2710,eb1a:2820,eb1a:2821,eb1a:2860,eb1a:2861,eb1a:2862,eb1a:2863,eb1a:2870,eb1a:2881,eb1a:2883,eb1a:2868] 2 -> Terratec Cinergy 250 USB (em2820/em2840) [0ccd:0036] 3 -> Pinnacle PCTV USB 2 (em2820/em2840) [2304:0208] 4 -> Hauppauge WinTV USB 2 (em2820/em2840) [2040:4200,2040:4201] @@ -7,7 +7,7 @@ 6 -> Terratec Cinergy 200 USB (em2800) 7 -> Leadtek Winfast USB II (em2800) [0413:6023] 8 -> Kworld USB2800 (em2800) - 9 -> Pinnacle Dazzle DVC 90/100/101/107 / Kaiser Baas Video to DVD maker (em2820/em2840) [1b80:e302,2304:0207,2304:021a] + 9 -> Pinnacle Dazzle DVC 90/100/101/107 / Kaiser Baas Video to DVD maker (em2820/em2840) [1b80:e302,1b80:e304,2304:0207,2304:021a] 10 -> Hauppauge WinTV HVR 900 (em2880) [2040:6500] 11 -> Terratec Hybrid XS (em2880) [0ccd:0042] 12 -> Kworld PVR TV 2800 RF (em2820/em2840) @@ -27,13 +27,15 @@ 26 -> Hercules Smart TV USB 2.0 (em2820/em2840) 27 -> Pinnacle PCTV USB 2 (Philips FM1216ME) (em2820/em2840) 28 -> Leadtek Winfast USB II Deluxe (em2820/em2840) + 29 -> EM2860/TVP5150 Reference Design (em2860) 30 -> Videology 20K14XUSB USB2.0 (em2820/em2840) 31 -> Usbgear VD204v9 (em2821) 32 -> Supercomp USB 2.0 TV (em2821) + 33 -> Elgato Video Capture (em2860) [0fd9:0033] 34 -> Terratec Cinergy A Hybrid XS (em2860) [0ccd:004f] 35 -> Typhoon DVD Maker (em2860) 36 -> NetGMBH Cam (em2860) - 37 -> Gadmei UTV330 (em2860) + 37 -> Gadmei UTV330 (em2860) [eb1a:50a6] 38 -> Yakumo MovieMixer (em2861) 39 -> KWorld PVRTV 300U (em2861) [eb1a:e300] 40 -> Plextor ConvertX PX-TV100U (em2861) [093b:a005] @@ -44,7 +46,7 @@ 45 -> Pinnacle PCTV DVB-T (em2870) 46 -> Compro, VideoMate U3 (em2870) [185b:2870] 47 -> KWorld DVB-T 305U (em2880) [eb1a:e305] - 48 -> KWorld DVB-T 310U (em2880) [eb1a:e310] + 48 -> KWorld DVB-T 310U (em2880) 49 -> MSI DigiVox A/D (em2880) [eb1a:e310] 50 -> MSI DigiVox A/D II (em2880) [eb1a:e320] 51 -> Terratec Hybrid XS Secam (em2880) [0ccd:004c] @@ -67,3 +69,8 @@ 69 -> KWorld ATSC 315U HDTV TV Box (em2882) [eb1a:a313] 70 -> Evga inDtube (em2882) 71 -> Silvercrest Webcam 1.3mpix (em2820/em2840) + 72 -> Gadmei UTV330+ (em2861) + 73 -> Reddo DVB-C USB TV Box (em2870) + 74 -> Actionmaster/LinXcel/Digitus VC211A (em2800) + 75 -> Dikom DK300 (em2882) + 76 -> KWorld PlusTV 340U or UB435-Q (ATSC) (em2870) [1b80:a340] Modified: trunk/tv/data/CARDLIST.saa7134 URL: http://svn.opensuse.org/viewcvs/yast/trunk/tv/data/CARDLIST.saa7134?rev=635… ============================================================================== --- trunk/tv/data/CARDLIST.saa7134 (original) +++ trunk/tv/data/CARDLIST.saa7134 Wed Mar 9 15:41:41 2011 @@ -126,7 +126,7 @@ 125 -> Beholder BeholdTV 409 [0000:4090] 126 -> Beholder BeholdTV 505 FM [5ace:5050] 127 -> Beholder BeholdTV 507 FM / BeholdTV 509 FM [5ace:5070,5ace:5090] -128 -> Beholder BeholdTV Columbus TVFM [0000:5201] +128 -> Beholder BeholdTV Columbus TV/FM [0000:5201] 129 -> Beholder BeholdTV 607 FM [5ace:6070] 130 -> Beholder BeholdTV M6 [5ace:6190] 131 -> Twinhan Hybrid DTV-DVB 3056 PCI [1822:0022] @@ -167,3 +167,16 @@ 166 -> Beholder BeholdTV 607 RDS [5ace:6073] 167 -> Beholder BeholdTV 609 RDS [5ace:6092] 168 -> Beholder BeholdTV 609 RDS [5ace:6093] +169 -> Compro VideoMate S350/S300 [185b:c900] +170 -> AverMedia AverTV Studio 505 [1461:a115] +171 -> Beholder BeholdTV X7 [5ace:7595] +172 -> RoverMedia TV Link Pro FM [19d1:0138] +173 -> Zolid Hybrid TV Tuner PCI [1131:2004] +174 -> Asus Europa Hybrid OEM [1043:4847] +175 -> Leadtek Winfast DTV1000S [107d:6655] +176 -> Beholder BeholdTV 505 RDS [0000:5051] +177 -> Hawell HW-404M7 +178 -> Beholder BeholdTV H7 [5ace:7190] +179 -> Beholder BeholdTV A7 [5ace:7090] +180 -> Avermedia PCI M733A [1461:4155,1461:4255] +181 -> TechoTrend TT-budget T-3000 [13c2:2804] Added: trunk/tv/data/CARDLIST.saa7164 URL: http://svn.opensuse.org/viewcvs/yast/trunk/tv/data/CARDLIST.saa7164?rev=635… ============================================================================== --- trunk/tv/data/CARDLIST.saa7164 (added) +++ trunk/tv/data/CARDLIST.saa7164 Wed Mar 9 15:41:41 2011 @@ -0,0 +1,9 @@ + 0 -> Unknown + 1 -> Generic Rev2 + 2 -> Generic Rev3 + 3 -> Hauppauge WinTV-HVR2250 (PCI DID: 8880,8810) [0070:8880,0070:8810] + 4 -> Hauppauge WinTV-HVR2200 (PCI DID: 8980) [0070:8980] + 5 -> Hauppauge WinTV-HVR2200 (PCI DID: 8900) [0070:8900] + 6 -> Hauppauge WinTV-HVR2200 (PCI DID: 8901) [0070:8901] + 7 -> Hauppauge WinTV-HVR2250 (PCI DID: 8891,8851) [0070:8891,0070:8851] + 8 -> Hauppauge WinTV-HVR2250 (PCI DID: 88A1) [0070:88A1] Modified: trunk/tv/data/CARDLIST.tuner URL: http://svn.opensuse.org/viewcvs/yast/trunk/tv/data/CARDLIST.tuner?rev=63552… ============================================================================== --- trunk/tv/data/CARDLIST.tuner (original) +++ trunk/tv/data/CARDLIST.tuner Wed Mar 9 15:41:41 2011 @@ -78,3 +78,8 @@ tuner=78 - Philips FMD1216MEX MK3 Hybrid Tuner tuner=79 - Philips PAL/SECAM multi (FM1216 MK5) tuner=80 - Philips FQ1216LME MK3 PAL/SECAM w/active loopthrough +tuner=81 - Partsnic (Daewoo) PTI-5NF05 +tuner=82 - Philips CU1216L +tuner=83 - NXP TDA18271 +tuner=84 - Sony BTF-Pxn01Z +tuner=85 - Philips FQ1236 MK5 Modified: trunk/tv/data/Makefile.am URL: http://svn.opensuse.org/viewcvs/yast/trunk/tv/data/Makefile.am?rev=63552&r1… ============================================================================== --- trunk/tv/data/Makefile.am (original) +++ trunk/tv/data/Makefile.am Wed Mar 9 15:41:41 2011 @@ -6,13 +6,13 @@ ydata_DATA = tv_cards-lirc_gpio.ycp tv_cards.ycp tv_tuners.ycp tv_dvbcards.ycp tv_dvbfirmware.ycp -tv_cards.ycp: CARDLIST.bttv CARDLIST.saa7134 CARDLIST.cx88 CARDLIST.ivtv CARDLIST.em28xx CARDLIST.cx23885 +tv_cards.ycp: CARDLIST.bttv CARDLIST.saa7134 CARDLIST.cx88 CARDLIST.ivtv CARDLIST.em28xx CARDLIST.cx23885 CARDLIST.saa7164 CARDLIST.au0828 $(srcdir)/create_tv_db $^ > $@ tv_tuners.ycp: CARDLIST.tuner $(srcdir)/create_tuner_db $^ > $@ -EXTRA_DIST = CARDLIST.bttv CARDLIST.saa7134 CARDLIST.cx88 CARDLIST.ivtv CARDLIST.tuner CARDLIST.em28xx CARDLIST.cx23885 \ +EXTRA_DIST = CARDLIST.bttv CARDLIST.saa7134 CARDLIST.cx88 CARDLIST.ivtv CARDLIST.tuner CARDLIST.em28xx CARDLIST.cx23885 CARDLIST.saa7164 CARDLIST.au0828 \ create_tv_db create_tuner_db tv_cards-lirc_gpio.ycp tv_dvbcards.ycp tv_dvbfirmware.ycp # delete generated files Modified: trunk/tv/data/create_tuner_db URL: http://svn.opensuse.org/viewcvs/yast/trunk/tv/data/create_tuner_db?rev=6355… ============================================================================== --- trunk/tv/data/create_tuner_db (original) +++ trunk/tv/data/create_tuner_db Wed Mar 9 15:41:41 2011 @@ -104,7 +104,7 @@ print "/* YaST2 TV tuners database\n"; print " *\n"; -print " * Generated ".qx(date); +print " * Generated at ".qx(LC_ALL=C date); print " * From: @ARGV\n"; print " */"; print "\n"; Modified: trunk/tv/data/create_tv_db URL: http://svn.opensuse.org/viewcvs/yast/trunk/tv/data/create_tv_db?rev=63552&r… ============================================================================== --- trunk/tv/data/create_tv_db (original) +++ trunk/tv/data/create_tv_db Wed Mar 9 15:41:41 2011 @@ -8,6 +8,8 @@ # $4 - the CARDLIST.ivtv source file # $5 - the CARDLIST.em28xx source file # $6 - the CARDLIST.cx23885 source file +# $7 - the CARDLIST.saa7164 source file +# $8 - the CARDLIST.au0828 source file # ...more to come... if ($#ARGV < 1) @@ -22,6 +24,8 @@ $ivtv_cardlist_fname = $ARGV[3]; $em28xx_cardlist_fname = $ARGV[4]; $cx23885_cardlist_fname = $ARGV[5]; +$saa7164_cardlist_fname = $ARGV[6]; +$au0828_cardlist_fname = $ARGV[7]; # ... more to come ... # Names to translate @@ -113,6 +117,12 @@ { $card_name = $1; } + + if ($card_name =~ /^(.*\S)\s*$(em|au).*$$/) + { + $card_name = $1; + } + $card_name = "\"$card_name\""; } @@ -141,7 +151,7 @@ print "/* YaST2 TV cards database\n"; print " *\n"; -print " * Generated ".qx(date); +print " * Generated at ".qx(LC_ALL=C date); print " * From: @ARGV\n"; print " */"; print "\n"; @@ -158,6 +168,8 @@ push @cards, ReadDatabase($ivtv_cardlist_fname, "ivtv"); push @cards, ReadDatabase($em28xx_cardlist_fname, "em28xx"); push @cards, ReadDatabase($cx23885_cardlist_fname, "cx23885"); +push @cards, ReadDatabase($saa7164_cardlist_fname, "saa7164"); +push @cards, ReadDatabase($au0828_cardlist_fname, "au0828"); #...more to come... # Sort @cards Modified: trunk/tv/package/yast2-tv.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/tv/package/yast2-tv.changes?rev=… ============================================================================== --- trunk/tv/package/yast2-tv.changes (original) +++ trunk/tv/package/yast2-tv.changes Wed Mar 9 15:41:41 2011 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Wed Mar 9 14:36:04 UTC 2011 - lslezak(a)suse.cz + +- updated TV card database +- 2.21.0 + +------------------------------------------------------------------- Wed Mar 24 08:22:27 UTC 2010 - lslezak(a)suse.cz - make some generated strings translatable (bnc#583240) -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r63551 - in /trunk/ncurses: package/yast2-ncurses.changes src/NCFileSelection.cc
by gs＠svn2.opensuse.org 09 Mar '11

09 Mar '11

Author: gs Date: Wed Mar 9 13:32:28 2011 New Revision: 63551 URL: http://svn.opensuse.org/viewcvs/yast?rev=63551&view=rev Log: Show block devices in file selection dialog (bnc #661685) Modified: trunk/ncurses/package/yast2-ncurses.changes trunk/ncurses/src/NCFileSelection.cc Modified: trunk/ncurses/package/yast2-ncurses.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/ncurses/package/yast2-ncurses.ch… ============================================================================== --- trunk/ncurses/package/yast2-ncurses.changes (original) +++ trunk/ncurses/package/yast2-ncurses.changes Wed Mar 9 13:32:28 2011 @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Wed Mar 9 13:31:41 CET 2011 - gs(a)suse.de + +- Show block devices in file selection dialog (bnc #661685) + +------------------------------------------------------------------- Thu Feb 24 13:10:43 CET 2011 - gs(a)suse.de - Bug-fix for bnc #673801 (deselecting items in NCTree with multi Modified: trunk/ncurses/src/NCFileSelection.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/ncurses/src/NCFileSelection.cc?r… ============================================================================== --- trunk/ncurses/src/NCFileSelection.cc (original) +++ trunk/ncurses/src/NCFileSelection.cc Wed Mar 9 13:32:28 2011 @@ -583,7 +583,7 @@ if ( lstat64( fullName.c_str(), &statInfo ) == 0 ) { - if ( S_ISREG( statInfo.st_mode ) ) + if ( S_ISREG( statInfo.st_mode ) || S_ISBLK( statInfo.st_mode ) ) { if ((( *it ) == ".." && currentDir != "/" ) || ( *it ) != ".." ) @@ -595,7 +595,7 @@ { if ( stat64( fullName.c_str(), &linkInfo ) == 0 ) { - if ( S_ISREG( linkInfo.st_mode ) ) + if ( S_ISREG( linkInfo.st_mode ) || S_ISBLK( linkInfo.st_mode ) ) { createListEntry( new NCFileInfo(( *it ), &linkInfo, true ) ); } -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0