Merge pull request #1360 from dmach/edit-attribute

Make 'meta' command capable of editing attributes

osc/commandline.py

@@ -1829,7 +1829,16 @@ def do_meta(self, subcmd, opts, *args):
         if opts.add and opts.set:
             self.argparse_error("Options --add and --set are mutually exclusive")
 
+        if cmd == "attribute" and opts.edit and not opts.attribute:
+            self.argparse_error("Please specify --attribute")
+
         apiurl = self.get_api_url()
+        project = None
+        package = None
+        subpackage = None
+        user = None
+        group = None
+        pattern = None
 
         # Specific arguments
         #
@@ -1966,6 +1975,16 @@ def do_meta(self, subcmd, opts, *args):
                           path_args=(project, pattern),
                           apiurl=apiurl,
                           template_args=None)
+            elif cmd == 'attribute':
+                edit_meta(
+                    metatype='attribute',
+                    edit=True,
+                    path_args=(quote_plus(project), quote_plus(opts.attribute)),
+                    apiurl=apiurl,
+                    # PUT is not supported
+                    method="POST",
+                    template_args=None,
+                )
 
         # create attribute entry
         if (opts.create or opts.set or opts.add) and cmd == 'attribute':

osc/core.py

@@ -3928,7 +3928,7 @@ def is_force_supported(self):
         def __call__(self, **kwargs):
             return self._delegate(**kwargs)
 
-    def __init__(self, url, input, change_is_required=False, file_ext='.xml'):
+    def __init__(self, url, input, change_is_required=False, file_ext='.xml', method=None):
         if isinstance(url, self._URLFactory):
             self._url_factory = url
         else:
@@ -3938,6 +3938,7 @@ def __init__(self, url, input, change_is_required=False, file_ext='.xml'):
         self.url = self._url_factory()
         self.change_is_required = change_is_required
         (fd, self.filename) = tempfile.mkstemp(prefix='osc_metafile.', suffix=file_ext)
+        self._method = method
 
         open_mode = 'w'
         input_as_str = None
@@ -3963,7 +3964,10 @@ def sync(self):
         print('Sending meta data...')
         # don't do any exception handling... it's up to the caller what to do in case
         # of an exception
-        http_PUT(self.url, file=self.filename)
+        if self._method == "POST":
+            http_POST(self.url, file=self.filename)
+        else:
+            http_PUT(self.url, file=self.filename)
         os.unlink(self.filename)
         print('Done.')
 
@@ -4020,7 +4024,7 @@ def discard(self):
                      'template': new_package_templ,
                      'file_ext': '.xml'
                      },
-             'attribute': {'path': 'source/%s/%s/_meta',
+             'attribute': {'path': 'source/%s/_attribute/%s',
                            'template': new_attribute_templ,
                            'file_ext': '.xml'
                            },
@@ -4116,6 +4120,7 @@ def edit_meta(
     remove_linking_repositories=False,
     change_is_required=False,
     apiurl: Optional[str] = None,
+    method: Optional[str] = None,
     msg=None,
 ):
 
@@ -4149,7 +4154,7 @@ def delegate(force=force):
         return make_meta_url(metatype, path_args, apiurl, force, remove_linking_repositories, msg)
 
     url_factory = metafile._URLFactory(delegate)
-    f = metafile(url_factory, data, change_is_required, metatypes[metatype]['file_ext'])
+    f = metafile(url_factory, data, change_is_required, metatypes[metatype]['file_ext'], method=method)
 
     if edit:
         f.edit()