cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fine-tune display, better progress report when scanning the ports tree

Browse Source
This commit is contained in:
espie 2015-06-06 15:01:43 +00:00
parent 729189cf1e
commit 72fc751185
2 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
infrastructure/bin/check-conflicts
View File

@ -1,6 +1,6 @@
#!/usr/bin/perl
# $OpenBSD: check-conflicts,v 1.11 2015/06/01 00:01:48 espie Exp $
# $OpenBSD: check-conflicts,v 1.12 2015/06/06 15:01:43 espie Exp $
# Copyright (c) 2000-2005
# Marc Espie. All rights reserved.
# Redistribution and use in source and binary forms, with or without
@ -39,8 +39,6 @@ use lib ("$ports1/infrastructure/lib", "$FindBin::Bin/../lib");
use File::Spec;
use File::Path;
use OpenBSD::PackingList;
use OpenBSD::AddCreateDelete;
use OpenBSD::PkgCfl;
use OpenBSD::PlistScanner;

9
infrastructure/lib/OpenBSD/PlistScanner.pm
View File

@ -1,4 +1,4 @@
# $OpenBSD: PlistScanner.pm,v 1.2 2015/05/29 10:40:06 espie Exp $
# $OpenBSD: PlistScanner.pm,v 1.3 2015/06/06 15:01:43 espie Exp $
# Copyright (c) 2014 Marc Espie <espie@openbsd.org>
#
# Permission to use, copy, modify, and distribute this software for any
@ -18,6 +18,8 @@ use warnings;
package OpenBSD::PlistScanner;
use OpenBSD::PackageInfo;
use OpenBSD::AddCreateDelete;
use OpenBSD::PackingList;
sub handle_plist
{
@ -105,9 +107,10 @@ sub handle_portsdir
}
$done = 1;
});
if (defined $plist && $plist->pkgname()) {
if (defined $plist && $plist->pkgname) {
$self->ui->progress->message($plist->fullpkgpath ||
$plist->pkgname);
$self->handle_plist($dir, $plist);
$self->ui->progress->working(10);
}
}
}