No need remove files and 'commitfilelist' command will do that, #731\
authorZhang Qiang <qiang.z.zhang@intel.com>
Sun, 14 Oct 2012 19:48:53 +0000 (15:48 -0400)
committerZhang Qiang <qiang.z.zhang@intel.com>
Sun, 14 Oct 2012 19:48:53 +0000 (15:48 -0400)
Change-Id: I69b9a673d08a22f5c5a337f2e96f59a87cd5f113

gitbuildsys/cmd_remotebuild.py
gitbuildsys/oscapi.py

index 693a68d..397355f 100644 (file)
@@ -218,9 +218,6 @@ def main(args):
         if api.exists(target_prj, package):
             old, _not_changed, changed, new = api.diff_files(target_prj,
                                                              package, files)
-            if old:
-                log.info("removing old files from OBS project")
-                api.remove_files(target_prj, package, old)
             commit_files = changed + new
         else:
             log.info('creating new package %s/%s' % (target_prj, package))
index 2e5a0d5..419fd3d 100644 (file)
@@ -266,43 +266,6 @@ class OSC(object):
         except OSCError, err:
             raise ObsError("can't commit files to %s/%s: %s" % (prj, pkg, err))
 
-    @waiting
-    def remove_files(self, prj, pkg, fnames=None):
-        """
-        Remove file[s] from the package.
-        If filenames are not provided remove all files.
-        """
-        if not fnames:
-            url = core.makeurl(self.apiurl, ['source', prj, pkg])
-            for i in (1, 2, 3):
-                try:
-                    response = self.core_http(core.http_GET, url).read()
-                    entries = core.ET.fromstring(response)
-                    break
-                except OSCError, err:
-                    raise ObsError("can't get list of sources from"\
-                                   " %s/%s: %s" % (prj, pkg, err))
-                except core.ET.ParseError, err:
-                    if i == 3:
-                        raise ObsError("Error parsing OBS response: %s" \
-                                       % str(err))
-                    continue
-
-            fnames = [entry.get('name') for entry in entries]
-
-        for fname in fnames:
-            if fname is None:
-                continue
-            query = 'rev=upload'
-            url = core.makeurl(self.apiurl,
-                               ['source', prj, pkg, pathname2url(fname)],
-                               query=query)
-            try:
-                self.core_http(core.http_DELETE, url)
-            except OSCError, err:
-                raise ObsError("can\'t remove file %s/%s/%s: %s" \
-                               % (prj, pkg, fname, err))
-
     def create_package(self, prj, pkg):
         """Create package in the project."""