summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rwxr-xr-xmkmodular11
1 files changed, 1 insertions, 10 deletions
diff --git a/mkmodular b/mkmodular
index 08e2cfa4..75bfad4d 100755
--- a/mkmodular
+++ b/mkmodular
@@ -182,20 +182,13 @@ EOT;
function findPackages($from, $dest, $pat) {
global $oldrpms;
- $fil = '.';
$rpms = [];
foreach (glob("$from/$pat") as $file) {
$info = rpminfo($file);
$name = basename($file);
if (!file_exists("$dest/$name")) {
if (link($file, "$dest/$name")) {
- if (in_array(basename($file), $oldrpms)) {
- echo $fil;
- if (count($rpms)%64==63) {
- echo "\r";
- $fil = ($fil == '.' ? '-' : '.');
- }
- } else {
+ if (!in_array(basename($file), $oldrpms)) {
printf("\r+ %-70s\n", basename($file));
}
}
@@ -207,7 +200,6 @@ function findPackages($from, $dest, $pat) {
$info['Release'] . '.' .
$info['Arch'];
}
- echo "\r " . count($rpms) . " rpms" . str_repeat(" ", 64) . "\n";
return $rpms;
}
@@ -250,7 +242,6 @@ $hash = hash('sha256', $mod);
exec("modifyrepo_c --mdtype=modules $data repodata");
$arch = basename($dest);
rename($data, "$data.$arch");
-echo " in $data.$arch\n";
chdir(__DIR__);
}