- added option to ignore the fact that a build isn't completed (src.builder

  isn't perfect you know)

Changed files:
    bin/pfa-mvpkg -> 1.10
    bin/pfa-testmvpkg -> 1.4
    modules/ftptree.py -> 1.13

diff --git a/bin/pfa-mvpkg b/bin/pfa-mvpkg
index ed322bb46017665bb930044d59ada2aafb878f83..cc295a4ff2960c30c77e116db47d7a8a42519990 100644 (file)
--- a/bin/pfa-mvpkg
+++ b/bin/pfa-mvpkg
@@ -3,13 +3,20 @@
 
 import sys, os
 sys.path.insert(0, os.environ['HOME']+'/pld-ftp-admin/modules')
-from ftptree import FtpTree
+import ftptree
 from common import checkdir
 import ftpio
 
-if len(sys.argv) < 3:
+nocheckbuild=False
+if len(sys.argv) > 4 and sys.argv[1]=='-nb':
+    nocheckbuild=True
+    sys.argv=sys.argv[1:]
+
+if len(sys.argv) < 4:
     print "Not enough parameters given"
-    print "move.py src-tree dst-tree [package1, package2, ...]"
+    print "move.py [options] src-tree dst-tree package [package2 package3 ...]"
+    print "\nOptions:"
+    print "      -nb    Do not check if builds are finished.\n"
     sys.exit(1)
 
 checkdir(sys.argv[1])
@@ -27,13 +34,15 @@ if not ftpio.lock(sys.argv[2], True):
     sys.exit(1)
 
 try:
-    srctree=FtpTree(sys.argv[1], loadall=True)
-    dsttree=FtpTree(sys.argv[2])
+    srctree=ftptree.FtpTree(sys.argv[1], loadall=True)
+    dsttree=ftptree.FtpTree(sys.argv[2])
+    if nocheckbuild:
+        srctree.do_checkbuild=False
     srctree.mark4moving(sys.argv[3:])
 
     srctree.movepkgs(dsttree)
 except ftptree.SomeError:
-    # In case of problems we need to unlock the tree before exiting
+    # In case of problems we need to unlock the trees before exiting
     ftpio.unlock(sys.argv[1])
     ftpio.unlock(sys.argv[2])
     sys.exit(1)

diff --git a/bin/pfa-testmvpkg b/bin/pfa-testmvpkg
index 28bed9724738b3beef960ae05b078ed40e207c9c..9914c9dd23fa7f59934dd654098abcad1ebc7393 100755 (executable)
--- a/bin/pfa-testmvpkg
+++ b/bin/pfa-testmvpkg
@@ -7,9 +7,9 @@ from ftptree import FtpTree
 from common import checkdir
 import ftpio
 
-if len(sys.argv) < 3:
+if len(sys.argv) < 4:
     print "Not enough parameters given"
-    print "move.py src-tree dst-tree [package1, package2, ...]"
+    print "test-move.py src-tree dst-tree package [package2 package3 ...]"
     sys.exit(1)
 
 checkdir(sys.argv[1])

diff --git a/modules/ftptree.py b/modules/ftptree.py
index 935f820f535c722211efebfdfb0d2e03bb65dd38..3b2c673592852e35eb85e65700833c2fc378f5c9 100644 (file)
--- a/modules/ftptree.py
+++ b/modules/ftptree.py
@@ -103,6 +103,7 @@ class FtpTree(BaseFtpTree):
         self.marked4moving=[]
         self.pkgnames=[]
         self.__loadpkgnames()
+        self.do_checkbuild=True
         if loadall:
             for pkgname in self.pkgnames:
                 self.loadedpkgs[pkgname]=Pkg(pkgname, self)
@@ -129,7 +130,8 @@ class FtpTree(BaseFtpTree):
         self.__checkarchs(dsttree)
 
     def movepkgs(self, dsttree):
-        self.__checkbuild()
+        if self.do_checkbuild:
+            self.__checkbuild()
         bailoutonerror()
         self.__checkarchs(dsttree)
         bailoutonerror()