From 2a180fa34625234fea4abf995709d48bcca953a7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Adrian=20Schr=C3=B6ter?= <adrian@suse.de>
Date: Wed, 19 Aug 2009 13:07:58 +0000
Subject: [PATCH] new packages gets checked out expanded when using "osc up -e"
 in project directory now.

---
 osc/commandline.py | 2 +-
 osc/core.py        | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/osc/commandline.py b/osc/commandline.py
index 62f05da6..dd0425c8 100755
--- a/osc/commandline.py
+++ b/osc/commandline.py
@@ -1793,7 +1793,7 @@ Please submit there instead, or use --nodevelproject to force direct submission.
                     # (a) update all packages
                     args += prj.pacs_have
                     # (b) fetch new packages
-                    prj.checkout_missing_pacs()
+                    prj.checkout_missing_pacs(opts.expand_link)
                     args.remove(arg)
 
         args.sort()
diff --git a/osc/core.py b/osc/core.py
index b47a8e15..56bbc5f0 100755
--- a/osc/core.py
+++ b/osc/core.py
@@ -302,7 +302,7 @@ class Project:
 
         self.pacs_missing = [ i for i in self.pacs_available if i not in self.pacs_have ]
 
-    def checkout_missing_pacs(self):
+    def checkout_missing_pacs(self, expand_link=False):
         for pac in self.pacs_missing:
 
             if conf.config['do_package_tracking'] and pac in self.pacs_unvers:
@@ -313,7 +313,7 @@ class Project:
                 print 'checking out new package %s' % pac
                 checkout_package(self.apiurl, self.name, pac, \
                                  pathname=getTransActPath(os.path.join(self.dir, pac)), \
-                                 prj_obj=self, prj_dir=self.dir)
+                                 prj_obj=self, prj_dir=self.dir, expand_link=expand_link)
 
     def set_state(self, pac, state):
         node = self.get_package_node(pac)
@@ -448,7 +448,7 @@ class Project:
                     if pac in self.pacs_broken:
                         if self.get_state(pac) != 'A':
                             checkout_package(self.apiurl, self.name, pac,
-                                             pathname=getTransActPath(os.path.join(self.dir, pac)), prj_obj=self, prj_dir=self.dir)
+                                             pathname=getTransActPath(os.path.join(self.dir, pac)), prj_obj=self, prj_dir=self.dir, expand_link=expand_link)
                     elif state == ' ':
                         # do a simple update
                         p = Package(os.path.join(self.dir, pac))
@@ -467,7 +467,7 @@ class Project:
                         # TODO: Package::update has to fixed to behave like svn does
                         if pac in self.pacs_broken:
                             checkout_package(self.apiurl, self.name, pac,
-                                             pathname=getTransActPath(os.path.join(self.dir, pac)), prj_obj=self, prj_dir=self.dir)
+                                             pathname=getTransActPath(os.path.join(self.dir, pac)), prj_obj=self, prj_dir=self.dir, expand_link=expand_link)
                         else:
                             Package(os.path.join(self.dir, pac)).update()
                     elif state == 'A' and pac in self.pacs_available: