Changeset 304

Timestamp:

01/14/11 03:16:26 (13 years ago)

Author:

nanardon

Message:

• fix typo

File:

• tools/trunk/bin/sophie-rpm (modified) (7 diffs)

tools/trunk/bin/sophie-rpm

@@ -36 +36 @@
 like C<http://proxy:8080/>
 
+=item -v
+
+Being verbose, show each required packages
+
 =back
 
@@ -91 +95 @@
     'l=s' => \my $login,
     'p=s' => \my $pass,
+    'v'   => \my $verbose,
     'proxy' => \my $proxy,
-
 ) or pod2usage;
-
-my %options;
-foreach (@options) {
-    m/([^=]+)\s*=\s*(.*)/ or next;
-    $options{$1} = $2;
-}
 
 $configfile ||= "$ENV{HOME}/.sophie.conf";
@@ -116 +114 @@
     login => $login,
     password => $pass,
-    type => $type,
     proxy => $proxy,
 );
@@ -143 +140 @@
 
 my @unresolved;
+my @dirnotfound;
 foreach my $rpmid (keys %rpmid) {
     warn "Analysing $rpmid{$rpmid}\n";
@@ -152 +150 @@
     if (ref $analyse && !$analyse->is_fault) {
         my $result = $analyse->value;
-        print "\nPackage requirements\n";
-        foreach my $dep (keys %{ $result->{bydep} }) {
-            print $dep . ":\n";
-            foreach (@{ $result->{bydep}{$dep}{pkg} || []}) {
-                print "    " . $sc->send_request('rpms.basicinfo', $_)->value->{filename};
-                print "\n";
-            }
-            foreach (@{ $result->{bydep}{$dep}{pool} || [] }) {
-                print "  * " . $pool{$_} . "\n";
+        if ($verbose) {
+            print "\nPackage requirements\n";
+            foreach my $dep (keys %{ $result->{bydep} }) {
+                print $dep . ":\n";
+                foreach (@{ $result->{bydep}{$dep}{pkg} || []}) {
+                    print "    " . $sc->send_request('rpms.basicinfo', $_)->value->{filename};
+                    print "\n";
+                }
+                foreach (@{ $result->{bydep}{$dep}{pool} || [] }) {
+                    print "  * " . $pool{$_} . "\n";
+                }
             }
         }
@@ -176 +176 @@
     if (ref $diranalyse && !$diranalyse->is_fault) {
         my $result = $diranalyse->value;
-        print "\nParent directories:\n";
-        foreach my $dir (sort keys %{ $result->{bydir} }) {
-            print $dir . ":\n";
-            if (@{ $result->{bydir}{$dir}{pkg} || []} > 3) {
-                print "    " . scalar(@{ $result->{bydir}{$dir}{pkg} || []}) .
-                " results in the distribution...\n";
-            } else {
-                foreach (@{ $result->{bydir}{$dir}{pkg} || []}) {
-                    print "    " . $sc->send_request('rpms.basicinfo', $_)->value->{filename};
-                    print "\n";
+        if ($verbose) {
+            print "\nParent directories:\n";
+            foreach my $dir (sort keys %{ $result->{bydir} }) {
+                print $dir . ":\n";
+                if (@{ $result->{bydir}{$dir}{pkg} || []} > 3) {
+                    print "    " . scalar(@{ $result->{bydir}{$dir}{pkg} || []}) .
+                    " results in the distribution...\n";
+                } else {
+                    foreach (@{ $result->{bydir}{$dir}{pkg} || []}) {
+                        print "    " . $sc->send_request('rpms.basicinfo', $_)->value->{filename};
+                        print "\n";
+                    }
+                }
+                foreach (@{ $result->{bydir}{$dir}{pool} || [] }) {
+                    print "  * " . $pool{$_} . "\n";
                 }
             }
-            foreach (@{ $result->{bydir}{$dir}{pool} || [] }) {
-                print "  * " . $pool{$_} . "\n";
-            }
         }
         if (@{ $result->{notfound} || []}) {
+            push(@dirnotfound, @{ $result->{notfound} });
             print "\nUnowned directories:\n";
             print  map { " $_\n" }  @{ $result->{notfound} };
@@ -202 +205 @@
 $sc->send_request('user.folder.clear');
 
+if (@dirnotfound) {
+    print "Warning, this directory are not owned by any package:\n";
+    print map { " $_\n" } @dirnotfound;
+    print "\n";
+}
 if (@unresolved) {
     print "Error, unresolved:\n";
     print  map { " $_\n" }  @unresolved;
+    print "\n";
     exit(1);
 } else {
+    print "No Error found\n";
     exit(0);
 }