projects
/
webmin.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
4b6d8ed
)
Handle new different package location format.
author
Jamie Cameron
<jcameron@webmin.com>
Thu, 4 Nov 2010 23:40:56 +0000
(16:40 -0700)
committer
Jamie Cameron
<jcameron@webmin.com>
Thu, 4 Nov 2010 23:40:56 +0000
(16:40 -0700)
https://sourceforge.net/tracker/?func=detail&atid=117457&aid=
3102632
&group_id=17457
software/slackware-lib.pl
patch
|
blob
|
history
diff --git
a/software/slackware-lib.pl
b/software/slackware-lib.pl
index
35cf293
..
a7b1320
100755
(executable)
--- a/
software/slackware-lib.pl
+++ b/
software/slackware-lib.pl
@@
-41,7
+41,8
@@
foreach $f (@list) {
$packages{$i,'class'} = $text{'slack_unclass'};
&open_tempfile(PKG, "$package_dir/$f");
while(<PKG>) {
- if (/^PACKAGE LOCATION:\s+disk([a-z]+)\d+/i) {
+ if (/^PACKAGE LOCATION:\s+disk([a-z]+)\d+/i ||
+ /^PACKAGE LOCATION:\s+\S+\/([a-z]+)\/[^\/]+$/i) {
$packages{$i,'class'} = $class_map{$1};
}
elsif (/^PACKAGE DESCRIPTION:/i) {